diff --git a/.gitmodules b/.gitmodules
index 88fbcee..c1754c9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "qois-infrastructure"]
-	path = qois-infrastructure
-	url = git@gitlab.com:qo.is/infrastructure.git
-	branch = master
 [submodule "defaults/threema"]
 	path = defaults/threema
 	url = git@github.com:fabianhauser/nixos-config-threema.git
diff --git a/flake.lock b/flake.lock
index e647e9a..f8321cc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -88,29 +88,6 @@
         "type": "github"
       }
     },
-    "qois-infrastructure": {
-      "inputs": {
-        "nixpkgs-nixos-2211": [
-          "nixpkgs-stable"
-        ],
-        "nixpkgs-nixos-unstable": [
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1672178774,
-        "narHash": "sha256-vQKhOHW24L9ctrzXcKeTVGu8FF6wRRxvR8ZSWeZU2z8=",
-        "ref": "cbbee659839cbc7374594a42c831d9d4d756a319",
-        "rev": "cbbee659839cbc7374594a42c831d9d4d756a319",
-        "revCount": 254,
-        "type": "git",
-        "url": "file:///etc/nixos/qois-infrastructure"
-      },
-      "original": {
-        "type": "git",
-        "url": "file:///etc/nixos/qois-infrastructure"
-      }
-    },
     "root": {
       "inputs": {
         "fcc-unlock": "fcc-unlock",
@@ -118,7 +95,6 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "qois-infrastructure": "qois-infrastructure",
         "threema": "threema"
       }
     },
diff --git a/flake.nix b/flake.nix
index 87b2819..693ed1e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,12 +9,6 @@
     home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
 
-    # Private Deps
-    qois-infrastructure = {
-      url = "git+file:///etc/nixos/qois-infrastructure";
-      inputs.nixpkgs-nixos-2211.follows = "nixpkgs-stable";
-      inputs.nixpkgs-nixos-unstable.follows = "nixpkgs-unstable";
-    };
     threema.url = "git+file:///etc/nixos/defaults/threema";
     threema.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
     fcc-unlock = {
@@ -25,14 +19,14 @@
   };
 
   outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager
-    , qois-infrastructure, nixos-hardware, threema, fcc-unlock, ... }@inputs:
+    , nixos-hardware, threema, fcc-unlock, ... }@inputs:
     let
       system = "x86_64-linux";
       pkgsUnstable = import nixpkgs-unstable {
         inherit system;
         config.allowUnfree = true; # For vscode
       };
-      hosts = [ "speer" "hummelberg" "ochsenchopf" "bachtel" ];
+      hosts = [ "speer" "hummelberg" "ochsenchopf" ];
     in {
       checks.${system}.formatCheck = let pkgs = pkgsUnstable;
       in pkgs.runCommand "nixfmt-check" { } ''
@@ -66,7 +60,6 @@
               hardwareModules = nixos-hardware.nixosModules;
             };
             modules = [
-              qois-infrastructure.nixosModules.default
               home-manager.nixosModules.home-manager
               ./host/${host}/default.nix
             ] ++ (if host == "bachtel" then [ ] else [ home-manager-config ]);
diff --git a/qois-infrastructure b/qois-infrastructure
deleted file mode 160000
index cbbee65..0000000
--- a/qois-infrastructure
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cbbee659839cbc7374594a42c831d9d4d756a319