diff --git a/flake.lock b/flake.lock
index d31551be..e66c9cd5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1653460119,
-        "narHash": "sha256-tP4mnBaE/2yehchIeRrCueF2NLS1G2XKGKq+q/oG0+o=",
+        "lastModified": 1653978486,
+        "narHash": "sha256-8TpFVaCgyFAo6x9SYxaEeRsYGrE77pKUJJeoFVUx0+I=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "9a49d754de250ad696e49c9ae4ce4561ffe3fc38",
+        "rev": "b39048a693e77ae77846aa7b351be7d3cacb8340",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1643404942,
-        "narHash": "sha256-JqMVxdcc1a97Ai1ZB89A/avfBaASDZAHJyK/27ZGPwk=",
-        "ref": "master",
-        "rev": "7b4f31c8f9a6a44c49550d4457285e1fcdfad980",
-        "revCount": 49,
+        "lastModified": 1653529936,
+        "narHash": "sha256-xFvcFcPzaFDiknkrnAAjboHGBlwMJzUmlqQO6fsKBmg=",
+        "ref": "refs/heads/master",
+        "rev": "dd8e033079737794b3f4f0c1711bd2b7ab0deb3f",
+        "revCount": 51,
         "type": "git",
         "url": "https://gitea.c3d2.de/astro/heliwatch.git"
       },
@@ -65,8 +65,12 @@
     },
     "hydra": {
       "inputs": {
-        "newNixpkgs": "newNixpkgs",
-        "nix": "nix",
+        "newNixpkgs": [
+          "nixpkgs"
+        ],
+        "nix": [
+          "nix"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -104,7 +108,9 @@
     "microvm": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1653399543,
@@ -140,39 +146,26 @@
         "type": "github"
       }
     },
-    "newNixpkgs": {
-      "locked": {
-        "lastModified": 1647380550,
-        "narHash": "sha256-909TI9poX7CIUiFx203WL29YON6m/I6k0ExbZvR7bLM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "6e3ee8957637a60f5072e33d78e05c0f65c54366",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nix": {
       "inputs": {
         "lowdown-src": "lowdown-src",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1649172203,
-        "narHash": "sha256-Q3nYaXqbseDOvZrlePKeIrx0/KzqyrtNpxHIUbtFHuI=",
-        "owner": "NixOS",
+        "lastModified": 1653986283,
+        "narHash": "sha256-/ZAS5a3u4/s6EQi8pLbp0GVxOOXbz9YaWkk0i1LJq1s=",
+        "owner": "nixos",
         "repo": "nix",
-        "rev": "5fe4fe823c193cbb7bfa05a468de91eeab09058d",
+        "rev": "04a699b8a9cebd83ece0011ec3a99e38a2adc3a8",
         "type": "github"
       },
       "original": {
-        "id": "nix",
-        "type": "indirect"
+        "owner": "nixos",
+        "repo": "nix",
+        "type": "github"
       }
     },
     "nixos-hardware": {
@@ -192,26 +185,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1645296114,
-        "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
-        "owner": "NixOS",
+        "lastModified": 1653988320,
+        "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
+        "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-21.05-small",
-        "type": "indirect"
+        "owner": "nixos",
+        "ref": "release-22.05",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-21_11": {
       "locked": {
-        "lastModified": 1653132211,
-        "narHash": "sha256-5ugEYisGqixwarfn3BJvuWDnO6gT/AoxlsA6jnG8Fv8=",
+        "lastModified": 1653819578,
+        "narHash": "sha256-a1vaUl6VZz1NsWxMw0i5lRyHIOVUIuMZdQzV+4s+rY8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b5991e4971523a5fcc9413b9003b58e5c15aa7d8",
+        "rev": "baa82d4b626288c7439eeea073a18aabbe435991",
         "type": "github"
       },
       "original": {
@@ -223,11 +217,11 @@
     },
     "nixpkgs-22_05": {
       "locked": {
-        "lastModified": 1653460991,
-        "narHash": "sha256-8MgFe84UUKw5k5MybirNH0S+oSluN2cRQGt+ZkW+dxQ=",
+        "lastModified": 1653822412,
+        "narHash": "sha256-xZwMDQ8MdNiTwE8dcKAX1h3qCmLtuudNGxmFUX3xIes=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0c3bf3a5c3ab6be29138b88900c417660a284fbd",
+        "rev": "db78278ff296cf21eca7e8c08ee99707387a54fa",
         "type": "github"
       },
       "original": {
@@ -237,21 +231,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-master": {
-      "locked": {
-        "lastModified": 1653522535,
-        "narHash": "sha256-7TsGwrYmBK0h25N0uarsRn4IuzCB8Jia35rTk5e15mw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "29777bb048a72132def87e5aa42b82d5522cea98",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-mobilizon": {
       "locked": {
         "lastModified": 1640913261,
@@ -294,65 +273,20 @@
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1652659998,
-        "narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1653520835,
-        "narHash": "sha256-voogHzRXOGjYA5a8D2l0I4N6wJFFg8RQWDm3uS/F6fs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e3a8165d29a5ade81d8588ce11362b5a318b8eb7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "release-22.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1651024496,
-        "narHash": "sha256-uKSrrw/neSkxX6TXPSaMyfu7iKzFrK7F6HOt6vQefGY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d9e593ed5889f3906dc72811c45bf684be8865cf",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
         "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
       }
     },
     "openwrt": {
       "flake": false,
       "locked": {
-        "lastModified": 1648742877,
-        "narHash": "sha256-YzVapVywbZKg98b7GEN8uLeuxJH2GHe90Q17dTYmImE=",
+        "lastModified": 1652825488,
+        "narHash": "sha256-cnkCtpdHBx55mxvw2c8cMua1adNWYoaLsjURgyvf61g=",
         "ref": "openwrt-21.02",
-        "rev": "ee62912b2db0018cd370f2c110e1391ee779cc6d",
-        "revCount": 51004,
+        "rev": "ce92de8c8c90aa2a6281cbfb046fcf6498b78786",
+        "revCount": 51055,
         "type": "git",
         "url": "https://git.openwrt.org/openwrt/openwrt.git"
       },
@@ -364,15 +298,19 @@
     },
     "openwrt-imagebuilder": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4",
-        "openwrt": "openwrt_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "openwrt": [
+          "openwrt"
+        ]
       },
       "locked": {
-        "lastModified": 1651275086,
-        "narHash": "sha256-HM0xBxcg7V4YXwXs//I1GJQJrIQ1jHMmY3zsYPsgRBY=",
+        "lastModified": 1652104163,
+        "narHash": "sha256-jqWI3nYPjUvsQbOnwEn12TmzYDrJ4e/uuVCaQzSvDaA=",
         "owner": "astro",
         "repo": "nix-openwrt-imagebuilder",
-        "rev": "34afaff593f10de376e50f2e02f61cb2d93e648e",
+        "rev": "4061b83f327f3feb9326c69e6df60065758a4470",
         "type": "github"
       },
       "original": {
@@ -381,22 +319,6 @@
         "type": "github"
       }
     },
-    "openwrt_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1651013664,
-        "narHash": "sha256-efpsYc8KfjIbcD0vdE+VC9tWS471NFAxUB884kJhUEE=",
-        "ref": "master",
-        "rev": "f757a8a09885e3c8bb76371e037b8c0731111980",
-        "revCount": 53988,
-        "type": "git",
-        "url": "https://git.openwrt.org/openwrt/openwrt.git?tag=v21.02.3"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.openwrt.org/openwrt/openwrt.git?tag=v21.02.3"
-      }
-    },
     "root": {
       "inputs": {
         "fenix": "fenix",
@@ -404,11 +326,13 @@
         "hydra": "hydra",
         "microvm": "microvm",
         "naersk": "naersk",
+        "nix": "nix",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-master": "nixpkgs-master",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-mobilizon": "nixpkgs-mobilizon",
         "nixpkgs-openwebrx": "nixpkgs-openwebrx",
+        "openwrt": "openwrt",
+        "openwrt-imagebuilder": "openwrt-imagebuilder",
         "scrapers": "scrapers",
         "secrets": "secrets",
         "sops-nix": "sops-nix",
@@ -422,11 +346,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1653426632,
-        "narHash": "sha256-hDUT+zbzU7SOJJr3VoKiDLJLubu7x6ggDfJ2rzYnYxY=",
+        "lastModified": 1653919537,
+        "narHash": "sha256-SasAyTjxvSRlP5istn8MealvR6qpBKYx3nNdAqUe/o8=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "d7c147406eff20783abba6ff1fe250ecc44cf800",
+        "rev": "a5d7ab54f950d197d79b8f9739016f18a93bc491",
         "type": "github"
       },
       "original": {
@@ -441,7 +365,7 @@
       "locked": {
         "lastModified": 1647380283,
         "narHash": "sha256-OJkUm4bJrgaZeaKvvE1VCmrAn/cxV62Nvv0o22A6GGc=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "81db905da940ebd02c446f9c9e1127406f3c136b",
         "revCount": 44,
         "type": "git",
@@ -464,7 +388,7 @@
       "locked": {
         "lastModified": 1653694823,
         "narHash": "sha256-1oLslaJa542QFe4bbIc3lKzVJ3qwrRcHZaA4zphFDA8=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "a9a729539ae829acc42c4461370a1bb511c647ea",
         "revCount": 127,
         "type": "git",
@@ -484,11 +408,11 @@
         "nixpkgs-22_05": "nixpkgs-22_05"
       },
       "locked": {
-        "lastModified": 1653462763,
-        "narHash": "sha256-n0beO7WNvAeEtTtnetzQCaGs615tU/DfM97k8r/7bUw=",
+        "lastModified": 1653827546,
+        "narHash": "sha256-va51HFf7UwktvriIbe9pjRPMr7p8IaxrwcDlZe7twzI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "7385b12722ce903e477878147794bed9040227e2",
+        "rev": "36b5901782e7fbfc191cace910f67f8b8743f678",
         "type": "github"
       },
       "original": {
@@ -522,7 +446,7 @@
       "locked": {
         "lastModified": 1651629079,
         "narHash": "sha256-NOJxEnLemUe1m9SKbtP5mjDPBj5JvgExFlrCZFrWxog=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "b2f2b53429b27fd61d396c48e59aa24bcb9ce318",
         "revCount": 86,
         "type": "git",
@@ -591,17 +515,21 @@
           "nixpkgs"
         ],
         "nixpkgs-master": [
-          "nixpkgs-master"
+          "nixpkgs"
         ],
-        "openwrt": "openwrt",
-        "openwrt-imagebuilder": "openwrt-imagebuilder"
+        "openwrt": [
+          "openwrt"
+        ],
+        "openwrt-imagebuilder": [
+          "openwrt-imagebuilder"
+        ]
       },
       "locked": {
-        "lastModified": 1653685024,
-        "narHash": "sha256-Z+wUh3Zyi4Hwaxmd/A3r/DN6tihWin2fy+3GvdZwqa8=",
-        "ref": "master",
-        "rev": "259a51f8a51e3d589965fcf98caaf25b52ba1e77",
-        "revCount": 1399,
+        "lastModified": 1653701951,
+        "narHash": "sha256-/65t4NnCXGTEqgxEHMXeGCriHE30VqWIy+2uqI/NvWk=",
+        "ref": "refs/heads/master",
+        "rev": "5dd984843be48f501a238e11fed83a5ec3239bdf",
+        "revCount": 1400,
         "type": "git",
         "url": "https://gitea.c3d2.de/zentralwerk/network.git"
       },
diff --git a/flake.nix b/flake.nix
index eff523b9..abbf8a3a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,32 +5,9 @@
     nixpkgs.url = "github:nixos/nixpkgs/release-22.05";
     nixpkgs-mobilizon.url = "github:minijackson/nixpkgs/mobilizon";
     nixpkgs-openwebrx.url = "github:astro/nixpkgs/openwebrx";
-    nixpkgs-master.url = "github:nixos/nixpkgs";
-    secrets = {
-      url = "git+ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        sops-nix.follows = "sops-nix";
-      };
-    };
     nixos-hardware.url = "github:nixos/nixos-hardware";
-    zentralwerk = {
-      url = "git+https://gitea.c3d2.de/zentralwerk/network.git";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        nixpkgs-master.follows = "nixpkgs-master";
-      };
-    };
-    yammat.url = "git+https://gitea.c3d2.de/astro/yammat.git?ref=nix";
-    yammat.inputs.nixpkgs.follows = "nixpkgs";
-    scrapers.url = "git+https://gitea.c3d2.de/astro/scrapers.git";
-    scrapers.flake = false;
-    spacemsg.url = "github:astro/spacemsg";
-    spacemsg.flake = false;
-    tigger.url = "github:astro/tigger";
-    tigger.flake = false;
-    ticker = {
-      url = "git+https://gitea.c3d2.de/astro/ticker.git";
+    fenix = {
+      url = "github:nix-community/fenix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     heliwatch = {
@@ -41,21 +18,79 @@
         naersk.follows = "naersk";
       };
     };
+    hydra = {
+      url = "github:nixos/hydra";
+      inputs = {
+        newNixpkgs.follows = "nixpkgs";
+        nix.follows = "nix";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+    microvm = {
+      url = "github:astro/microvm.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    naersk = {
+      url = "github:nix-community/naersk";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nix = {
+      url = "github:/nixos/nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    openwrt = {
+      url = "git+https://git.openwrt.org/openwrt/openwrt.git?ref=openwrt-21.02";
+      flake = false;
+    };
+    openwrt-imagebuilder = {
+      url = "github:astro/nix-openwrt-imagebuilder";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        openwrt.follows = "openwrt";
+      };
+    };
+    scrapers = {
+      url = "git+https://gitea.c3d2.de/astro/scrapers.git";
+      flake = false;
+    };
+    secrets = {
+      url = "git+ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        sops-nix.follows = "sops-nix";
+      };
+    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs = {
         nixpkgs.follows = "nixpkgs";
       };
     };
-    naersk.url = "github:nix-community/naersk";
-    naersk.inputs.nixpkgs.follows = "nixpkgs";
-    fenix.url = "github:nix-community/fenix";
-    fenix.inputs.nixpkgs.follows = "nixpkgs";
-    hydra = {
-      url = "github:nixos/hydra";
+    spacemsg = {
+      url = "github:astro/spacemsg";
+      flake = false;
+    };
+    ticker = {
+      url = "git+https://gitea.c3d2.de/astro/ticker.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    microvm.url = "github:astro/microvm.nix";
+    tigger = {
+      url = "github:astro/tigger";
+      flake = false;
+    };
+    yammat = {
+      url = "git+https://gitea.c3d2.de/astro/yammat.git?ref=nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    zentralwerk = {
+      url = "git+https://gitea.c3d2.de/zentralwerk/network.git";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        nixpkgs-master.follows = "nixpkgs";
+        openwrt.follows = "openwrt";
+        openwrt-imagebuilder.follows = "openwrt-imagebuilder";
+      };
+    };
   };
 
   outputs = inputs@{ self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, spacemsg, tigger, ticker, heliwatch, sops-nix, naersk, fenix, microvm, ... }:
@@ -298,7 +333,6 @@
         };
 
         gitea = nixosSystem' {
-          nixpkgs = inputs.nixpkgs-master;
           modules = [
             ./config/lxc-container.nix
             ./hosts/containers/gitea
@@ -348,7 +382,6 @@
         };
 
         nncp = nixosSystem' {
-          nixpkgs = inputs.nixpkgs-master;
           modules = [
             self.nixosModules.nncp
             ./config/lxc-container.nix
@@ -504,7 +537,6 @@
         };
 
         c3d2-web = nixosSystem' {
-          nixpkgs = inputs.nixpkgs-master;
           modules = [
             ./config/lxc-container.nix
             ./hosts/containers/c3d2-web