diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/by-name/fd/fdroidserver/package.nix
similarity index 80%
rename from pkgs/development/tools/fdroidserver/default.nix
rename to pkgs/by-name/fd/fdroidserver/package.nix
index dd3f45769a50..832b2d62cc07 100644
--- a/pkgs/development/tools/fdroidserver/default.nix
+++ b/pkgs/by-name/fd/fdroidserver/package.nix
@@ -1,37 +1,17 @@
 {
   lib,
   fetchFromGitLab,
+  python3Packages,
+  python3,
   fetchPypi,
   apksigner,
-  appdirs,
-  buildPythonApplication,
-  python3,
   installShellFiles,
-  androguard,
-  babel,
-  clint,
-  defusedxml,
-  gitpython,
-  libcloud,
-  mwclient,
-  oscrypto,
-  paramiko,
-  pillow,
-  pyasn1,
-  pyasn1-modules,
-  python-vagrant,
-  pyyaml,
-  qrcode,
-  requests,
-  ruamel-yaml,
-  sdkmanager,
-  yamllint,
 }:
 
 let
-  version = "2.3a1";
+  version = "2.3a2";
 in
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "fdroidserver";
   inherit version;
 
@@ -40,8 +20,8 @@ buildPythonApplication {
   src = fetchFromGitLab {
     owner = "fdroid";
     repo = "fdroidserver";
-    rev = "2.3a1";
-    hash = "sha256-K6P5yGx2ZXHJZ/VyHTbQAObsvcfnOatrpwiW+ixLTuA=";
+    rev = version;
+    hash = "sha256-nsAFBZqxo4XVWU6nBjo2T6VhU8U4I8h/FRXd1L240rk=";
   };
 
   pythonRelaxDeps = [
@@ -68,11 +48,11 @@ buildPythonApplication {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = [ babel ];
+  build-system = with python3Packages; [ babel ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     androguard
-    appdirs
+    platformdirs
     clint
     defusedxml
     gitpython
@@ -83,6 +63,7 @@ buildPythonApplication {
     pillow
     pyasn1
     pyasn1-modules
+    pycountry
     python-vagrant
     pyyaml
     qrcode
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdb9a12185f0..5c475984d2e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5025,8 +5025,6 @@ with pkgs;
 
   fdroidcl = pkgs.callPackage ../development/mobile/fdroidcl { };
 
-  fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { };
-
   fedimint = callPackage ../by-name/fe/fedimint/package.nix {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };