diff --git a/defaults/threema b/defaults/threema
index 335f677..8e3515b 160000
--- a/defaults/threema
+++ b/defaults/threema
@@ -1 +1 @@
-Subproject commit 335f67717d22018fbcbf6ca842207d9ae0433ec0
+Subproject commit 8e3515bf9deccd5e740dd346f49fa030d7537c0f
diff --git a/flake.lock b/flake.lock
index bff7828..37bb403 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,29 +57,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-nixos-2205": {
-      "locked": {
-        "lastModified": 1668543224,
-        "narHash": "sha256-wKeb21iBIV7ggdWGcs0y0kXWCJrNfQjpl5k6Q3rikXA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "814f8f3363cecee7cce314286846e4da5e92d689",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1672791794,
-        "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=",
+        "lastModified": 1672953546,
+        "narHash": "sha256-oz757DnJ1ITvwyTovuwG3l9cX6j9j6/DH9eH+cXFJmc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d",
+        "rev": "a518c77148585023ff56022f09c4b2c418a51ef5",
         "type": "github"
       },
       "original": {
@@ -91,11 +75,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1672791794,
-        "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=",
+        "lastModified": 1672953546,
+        "narHash": "sha256-oz757DnJ1ITvwyTovuwG3l9cX6j9j6/DH9eH+cXFJmc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d",
+        "rev": "a518c77148585023ff56022f09c4b2c418a51ef5",
         "type": "github"
       },
       "original": {
@@ -107,17 +91,19 @@
     },
     "qois-infrastructure": {
       "inputs": {
-        "nixpkgs-nixos-2205": "nixpkgs-nixos-2205",
+        "nixpkgs-nixos-2211": [
+          "nixpkgs-stable"
+        ],
         "nixpkgs-nixos-unstable": [
           "nixpkgs-unstable"
         ]
       },
       "locked": {
-        "lastModified": 1668780698,
-        "narHash": "sha256-XcvgI08rrzA71tXj3JK0ZvEofzLLb2DlQVuVjAtS4Kw=",
-        "ref": "fe42502147059db67e6b26b9df6da1ae19caf6b0",
-        "rev": "fe42502147059db67e6b26b9df6da1ae19caf6b0",
-        "revCount": 241,
+        "lastModified": 1672178774,
+        "narHash": "sha256-vQKhOHW24L9ctrzXcKeTVGu8FF6wRRxvR8ZSWeZU2z8=",
+        "ref": "refs/heads/master",
+        "rev": "cbbee659839cbc7374594a42c831d9d4d756a319",
+        "revCount": 254,
         "type": "git",
         "url": "file:///etc/nixos/qois-infrastructure"
       },
@@ -144,11 +130,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673019586,
-        "narHash": "sha256-1PcRlH0zJDlUaFv68CE6IslqBt9S8Hfth9RUbwv9qag=",
+        "lastModified": 1673254091,
+        "narHash": "sha256-Y70AwZlxLUgN5JXpeuvg2cXYThQZelW8egi9uk/99Ws=",
         "ref": "refs/heads/main",
-        "rev": "335f67717d22018fbcbf6ca842207d9ae0433ec0",
-        "revCount": 46,
+        "rev": "8e3515bf9deccd5e740dd346f49fa030d7537c0f",
+        "revCount": 47,
         "type": "git",
         "url": "file:///etc/nixos/defaults/threema"
       },
diff --git a/qois-infrastructure b/qois-infrastructure
index fe42502..cbbee65 160000
--- a/qois-infrastructure
+++ b/qois-infrastructure
@@ -1 +1 @@
-Subproject commit fe42502147059db67e6b26b9df6da1ae19caf6b0
+Subproject commit cbbee659839cbc7374594a42c831d9d4d756a319