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 82%
rename from pkgs/applications/networking/ostinato/default.nix
rename to pkgs/by-name/os/ostinato/package.nix
index 09001da1999b..c7bae24b536b 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/by-name/os/ostinato/package.nix
@@ -3,13 +3,10 @@
   stdenv,
   fetchFromGitHub,
   fetchurl,
-  qmake,
+  qt5,
   copyDesktopItems,
-  wrapQtAppsHook,
   makeDesktopItem,
-  qtbase,
-  qtscript,
-  protobuf,
+  protobuf_21,
   libpcap,
   wireshark,
   gzip,
@@ -17,35 +14,42 @@
   gawk,
   libnl,
 }:
+let
+  protobuf = protobuf_21;
 
-stdenv.mkDerivation rec {
+  ostinatoIcon = fetchurl {
+    url = "https://ostinato.org/images/site-logo.png";
+    hash = "sha256-9cBngj8pNOTTWNdvZaND79aa14OnrqvXq0zjzQNJDXA=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "ostinato";
   version = "1.3.0";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "pstavirs";
     repo = "ostinato";
-    rev = "v${version}";
-    sha256 = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo=";
-  };
-
-  ostinatoIcon = fetchurl {
-    url = "https://ostinato.org/images/site-logo.png";
-    sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/fPUxGeh5Cc3rb+1mR0chkiFPw5m+O6KtWDvzLn0iYo=";
   };
 
   buildInputs = [
-    qtbase
+    qt5.qtbase
     protobuf
     libpcap
-    qtscript
+    qt5.qtscript
     libnl
   ];
 
   nativeBuildInputs = [
     copyDesktopItems
-    qmake
-    wrapQtAppsHook
+    qt5.qmake
+    qt5.wrapQtAppsHook
+    qt5.qtscript
+    protobuf
   ];
 
   patches = [ ./drone_ini.patch ];
@@ -92,4 +96,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ rick68 ];
     platforms = with lib.platforms; linux ++ darwin ++ cygwin;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8af2b6d4e59..9eae9b2028a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9171,10 +9171,6 @@ with pkgs;
 
   ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
 
-  ostinato = libsForQt5.callPackage ../applications/networking/ostinato {
-    protobuf = protobuf_21;
-  };
-
   pcmanfm-qt = lxqt.pcmanfm-qt;
 
   pijuice = with python3Packages; toPythonApplication pijuice;