diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index db5dddd4d8d6..8e7ceccc4277 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4811,6 +4811,12 @@
     githubId = 26877687;
     name = "Yurii Izorkin";
   };
+  j0xaf = {
+    email = "j0xaf@j0xaf.de";
+    name = "Jörn Gersdorf";
+    github = "j0xaf";
+    githubId = 932697;
+  };
   j0hax = {
     name = "Johannes Arnold";
     email = "johannes.arnold@stud.uni-hannover.de";
diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix
new file mode 100644
index 000000000000..96b07874df45
--- /dev/null
+++ b/pkgs/tools/admin/fits-cloudctl/default.nix
@@ -0,0 +1,25 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "fits-cloudctl";
+  version = "0.9.11";
+
+  src = fetchFromGitHub {
+    owner = "fi-ts";
+    repo = "cloudctl";
+    rev = "v${version}";
+    sha256 = "1i9h96b0b69ib72b2ayp8mhgvkm21jbh8mf7wb1fp2gdzbxcgrhg";
+  };
+
+  vendorSha256 = "1fs1jqxz36i25vyb0mznkjglz8wwq9a8884052cjpacvsgd3glkf";
+
+  meta = with lib; {
+    description = "Command-line client for FI-TS Finance Cloud Native services";
+    homepage = "https://github.com/fi-ts/cloudctl";
+    license = licenses.mit;
+    maintainers = with maintainers; [ j0xaf ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7fbd3653863..67e974b0ead5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2771,6 +2771,8 @@ with pkgs;
 
   firestarter = callPackage ../applications/misc/firestarter { };
 
+  fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { };
+
   frangipanni = callPackage ../tools/text/frangipanni { };
 
   fselect = callPackage ../tools/misc/fselect { };