diff --git a/pkgs/applications/networking/ostinato/drone_ini.patch b/pkgs/by-name/os/ostinato/drone_ini.patch
similarity index 100%
rename from pkgs/applications/networking/ostinato/drone_ini.patch
rename to pkgs/by-name/os/ostinato/drone_ini.patch
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/by-name/os/ostinato/package.nix
similarity index 95%
rename from pkgs/applications/networking/ostinato/default.nix
rename to pkgs/by-name/os/ostinato/package.nix
index a921d13a83fe..a2940e3f4a41 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/by-name/os/ostinato/package.nix
@@ -3,12 +3,9 @@
   stdenv,
   fetchFromGitHub,
   fetchurl,
-  qmake,
+  qt5,
   copyDesktopItems,
-  wrapQtAppsHook,
   makeDesktopItem,
-  qtbase,
-  qtscript,
   protobuf_21,
   libpcap,
   wireshark,
@@ -19,6 +16,11 @@
 }:
 let
   protobuf = protobuf_21;
+
+  ostinatoIcon = fetchurl {
+    url = "https://ostinato.org/images/site-logo.png";
+    sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
+  };
 in
 stdenv.mkDerivation rec {
   pname = "ostinato";
@@ -31,23 +33,18 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo=";
   };
 
-  ostinatoIcon = fetchurl {
-    url = "https://ostinato.org/images/site-logo.png";
-    sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
-  };
-
   buildInputs = [
-    qtbase
+    qt5.qtbase
     protobuf
     libpcap
-    qtscript
+    qt5.qtscript
     libnl
   ];
 
   nativeBuildInputs = [
     copyDesktopItems
-    qmake
-    wrapQtAppsHook
+    qt5.qmake
+    qt5.wrapQtAppsHook
   ];
 
   patches = [ ./drone_ini.patch ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23e7642ec1c7..eac80393c4c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9198,8 +9198,6 @@ with pkgs;
 
   ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
 
-  ostinato = libsForQt5.callPackage ../applications/networking/ostinato { };
-
   pcmanfm-qt = lxqt.pcmanfm-qt;
 
   pijuice = with python3Packages; toPythonApplication pijuice;