diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/by-name/cr/cryptomator/package.nix
similarity index 98%
rename from pkgs/tools/security/cryptomator/default.nix
rename to pkgs/by-name/cr/cryptomator/package.nix
index ab469700c579..bf357c0e171a 100644
--- a/pkgs/tools/security/cryptomator/default.nix
+++ b/pkgs/by-name/cr/cryptomator/package.nix
@@ -4,13 +4,16 @@
   autoPatchelfHook,
   fuse3,
   maven,
-  jdk,
+  jdk23,
   makeShellWrapper,
   glib,
   wrapGAppsHook3,
   libayatana-appindicator,
 }:
 
+let
+  jdk = jdk23.override { enableJavaFX = true; };
+in
 maven.buildMavenPackage rec {
   pname = "cryptomator";
   version = "1.14.1";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16b6aa095873..fcc26ebc111d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12458,10 +12458,6 @@ with pkgs;
     inherit (pkgs) meson;
   };
 
-  cryptomator = callPackage ../tools/security/cryptomator {
-    jdk = jdk23.override { enableJavaFX = true; };
-  };
-
   # Darwin package set
   #
   # Even though this is a set of packages not single package, use `callPackage`