diff --git a/pkgs/tools/security/firefox_decrypt/default.nix b/pkgs/by-name/fi/firefox_decrypt/package.nix
similarity index 75%
rename from pkgs/tools/security/firefox_decrypt/default.nix
rename to pkgs/by-name/fi/firefox_decrypt/package.nix
index 8b4a1464b743..bacdb7c77728 100644
--- a/pkgs/tools/security/firefox_decrypt/default.nix
+++ b/pkgs/by-name/fi/firefox_decrypt/package.nix
@@ -1,28 +1,25 @@
 {
   lib,
   fetchFromGitHub,
-  buildPythonApplication,
-  setuptools,
-  setuptools-scm,
-  wheel,
   nss,
   nix-update-script,
   stdenv,
+  python3Packages,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "firefox_decrypt";
   version = "1.1.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "unode";
-    repo = pname;
-    tag = "${version}";
+    repo = "firefox_decrypt";
+    tag = version;
     hash = "sha256-HPjOUWusPXoSwwDvW32Uad4gFERvn79ee/WxeX6h3jY=";
   };
 
-  nativeBuildInputs = [
+  build-system = with python3Packages; [
     setuptools
     setuptools-scm
     wheel
@@ -37,12 +34,12 @@ buildPythonApplication rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/unode/firefox_decrypt";
     description = "Tool to extract passwords from profiles of Mozilla Firefox and derivates";
     mainProgram = "firefox_decrypt";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       schnusch
       unode
     ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f18dc312401..ada05947688f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12316,8 +12316,6 @@ with pkgs;
     ];
   };
 
-  firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { };
-
   floorp-unwrapped = import ../applications/networking/browsers/floorp {
     inherit
       stdenv