diff --git a/flake.lock b/flake.lock
index b84d5d8..7a3dffc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1654113405,
-        "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
+        "lastModified": 1656169755,
+        "narHash": "sha256-Nlnm4jeQWEGjYrE6hxi/7HYHjBSZ/E0RtjCYifnNsWk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
+        "rev": "4a3d01fb53f52ac83194081272795aa4612c2381",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1654057797,
-        "narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=",
+        "lastModified": 1656241064,
+        "narHash": "sha256-+jWwBt515aFGukeX8WSafg9CM3Ju3FD0XrF+X4ph0mU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af",
+        "rev": "99e33a57149916ebede78ec13edd9ba310c10f2f",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1654360807,
-        "narHash": "sha256-wYG86PUkPZ1P/oHsCpepTkb/U26poaEPPp1XFjRsgdA=",
+        "lastModified": 1656265786,
+        "narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d9794b04bffb468b886c553557489977ae5f4c65",
+        "rev": "cd90e773eae83ba7733d2377b6cdf84d45558780",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1654230545,
-        "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
+        "lastModified": 1656239181,
+        "narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
+        "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
         "type": "github"
       },
       "original": {
@@ -70,7 +70,7 @@
     },
     "qois-infrastructure": {
       "inputs": {
-        "nixpkgs-nixos-2111": [
+        "nixpkgs-nixos-2205": [
           "nixpkgs-stable"
         ],
         "nixpkgs-nixos-unstable": [
@@ -78,11 +78,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1650734999,
-        "narHash": "sha256-pDsN7yBWy+os/JuO0I6j5b3ehgU7dz/wvJK0DTvJ87E=",
-        "ref": "master",
-        "rev": "551db84dc6b46f010ab618a1650eaea79a25734a",
-        "revCount": 213,
+        "lastModified": 1655645627,
+        "narHash": "sha256-FsqHjHTNha3+skPauQHYoI6FQ8VXylTmBQMxqHfGszw=",
+        "ref": "HEAD",
+        "rev": "4df1567cb963466ff1735259ff8d29602d0c7711",
+        "revCount": 222,
         "type": "git",
         "url": "file:///etc/nixos/qois-infrastructure"
       },
@@ -108,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1650877398,
-        "narHash": "sha256-hkzJhW+NKhiiIsg2SnztDH6nkVq1YMmFkvRoahbPRR8=",
-        "ref": "HEAD",
-        "rev": "4d661f86a810e80581521b7000d76b1d1d40833d",
-        "revCount": 5,
+        "lastModified": 1654170332,
+        "narHash": "sha256-HwKvY9SDPrtWEWiWsBQxwLJ+4FKoyAa7Pu0XQgim6Eg=",
+        "ref": "main",
+        "rev": "1b46466bb3dfa5cb6a84d7ef00d41e3112c779b7",
+        "revCount": 10,
         "type": "git",
         "url": "file:///etc/nixos/defaults/threema"
       },
diff --git a/flake.nix b/flake.nix
index f015bd2..9c857b4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,7 @@
     # Private Deps
     qois-infrastructure = {
       url = "git+file:///etc/nixos/qois-infrastructure";
-      inputs.nixpkgs-nixos-2111.follows = "nixpkgs-stable";
+      inputs.nixpkgs-nixos-2205.follows = "nixpkgs-stable";
       inputs.nixpkgs-nixos-unstable.follows = "nixpkgs-unstable";
     };
     threema.url = "git+file:///etc/nixos/defaults/threema";
diff --git a/qois-infrastructure b/qois-infrastructure
index 551db84..4df1567 160000
--- a/qois-infrastructure
+++ b/qois-infrastructure
@@ -1 +1 @@
-Subproject commit 551db84dc6b46f010ab618a1650eaea79a25734a
+Subproject commit 4df1567cb963466ff1735259ff8d29602d0c7711