diff --git a/config/common/users.nix b/config/common/users.nix
index 4ddef2a..400a106 100644
--- a/config/common/users.nix
+++ b/config/common/users.nix
@@ -6,9 +6,14 @@
 # - https://git.grzb.de/yuri/nix-infra/-/blob/342a2f732da042d04e579d98e9f834418b7ebf25/users/colmena-deploy/default.nix
 # - https://nixos.org/manual/nix/stable/command-ref/conf-file.html?highlight=nix.conf#available-settings
 
-{ config, pkgs, lib, authorizedKeysRepo, ... }:
+{ config, pkgs, lib, ... }:
 
 let
+  authorizedKeysRepo = builtins.fetchGit {
+    url = "forgejo@git.hamburg.ccc.de:CCCHH/infrastructure-authorized-keys.git"; 
+    ref = "trunk";
+    rev = "686a6af22f6696f0c0595c56f463c078550049fc";
+  };
   authorizedKeys = builtins.filter (item: item != "") (lib.strings.splitString "\n" (builtins.readFile "${authorizedKeysRepo}/authorized_keys"));
 in
 {
diff --git a/flake.lock b/flake.lock
index be287b5..a41bdb5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,19 +1,5 @@
 {
   "nodes": {
-    "authorizedKeysRepo": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731276342,
-        "narHash": "sha256-plTYjM6zPzoBE/dp6EUrk9mCqmab278p8FqBCTX8Grc=",
-        "rev": "686a6af22f6696f0c0595c56f463c078550049fc",
-        "type": "tarball",
-        "url": "https://git.hamburg.ccc.de/api/v1/repos/CCCHH/infrastructure-authorized-keys/archive/686a6af22f6696f0c0595c56f463c078550049fc.tar.gz?rev=686a6af22f6696f0c0595c56f463c078550049fc"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys/archive/686a6af22f6696f0c0595c56f463c078550049fc.tar.gz"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1731200463,
@@ -82,7 +68,6 @@
     },
     "root": {
       "inputs": {
-        "authorizedKeysRepo": "authorizedKeysRepo",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_2",
         "sops-nix": "sops-nix"
diff --git a/flake.nix b/flake.nix
index b7b74a4..5d1d5e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,18 +20,10 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    authorizedKeysRepo = {
-      url = "https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys/archive/686a6af22f6696f0c0595c56f463c078550049fc.tar.gz";
-      flake = false;
-    };
   };
 
-  outputs = { self, nixpkgs, nixos-generators, sops-nix, authorizedKeysRepo, ... }:
+  outputs = { self, nixpkgs, nixos-generators, sops-nix, ... }:
     let
-      specialArgs = {
-        inherit authorizedKeysRepo;
-      };
       system = "x86_64-linux";
     in
     {
@@ -51,7 +43,7 @@
       };
       nixosConfigurations = {
         audio-hauptraum-kueche = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -61,7 +53,7 @@
         };
 
         audio-hauptraum-tafel = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -71,7 +63,7 @@
         };
 
         esphome = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -80,7 +72,7 @@
         };
 
         public-reverse-proxy = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -89,7 +81,7 @@
         };
 
         netbox = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -100,7 +92,7 @@
         };
 
         matrix = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -111,7 +103,7 @@
         };
 
         public-web-static = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -122,7 +114,7 @@
         };
 
         git = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -133,7 +125,7 @@
         };
 
         forgejo-actions-runner = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -144,7 +136,7 @@
         };
 
         ptouch-print-server = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -153,7 +145,7 @@
         };
 
         eh22-wiki = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -163,7 +155,7 @@
         };
 
         nix-box-june = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -173,7 +165,7 @@
         };
 
         yate = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -182,7 +174,7 @@
         };
 
         mqtt = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -191,7 +183,7 @@
         };
 
         mjolnir = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -202,7 +194,7 @@
         };
 
         woodpecker = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -213,7 +205,7 @@
         };
 
         status = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -223,7 +215,7 @@
         };
 
         penpot = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -234,7 +226,7 @@
         };
 
         hydra = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
+          inherit system;
           modules = [
             self.nixosModules.common
             self.nixosModules.proxmox-vm
@@ -246,7 +238,6 @@
 
       packages.x86_64-linux = {
         proxmox-nixos-template = nixos-generators.nixosGenerate {
-          inherit specialArgs;
           system = "x86_64-linux";
           modules = [
             ./config/nixos-generators/proxmox.nix
@@ -257,7 +248,6 @@
         };
 
         proxmox-chaosknoten-nixos-template = nixos-generators.nixosGenerate {
-          inherit specialArgs;
           system = "x86_64-linux";
           modules = [
             ./config/nixos-generators/proxmox-chaosknoten.nix