diff --git a/hosts/cryodev-main/services/default.nix b/hosts/cryodev-main/services/default.nix
index 0bd3c67..7bdae19 100644
--- a/hosts/cryodev-main/services/default.nix
+++ b/hosts/cryodev-main/services/default.nix
@@ -1,13 +1,15 @@
 {
   imports = [
-    ./forgejo.nix
-    ./headplane.nix
+    # TODO: Enable after first install when SOPS secrets are configured
+    # ./forgejo.nix
+    # ./headplane.nix
+    # ./mailserver.nix
+    # ./tailscale.nix
+
     ./headscale.nix
-    ./mailserver.nix
     ./netdata.nix
     ./nginx.nix
     ./openssh.nix
     ./sops.nix
-    ./tailscale.nix
   ];
 }
diff --git a/hosts/cryodev-main/services/sops.nix b/hosts/cryodev-main/services/sops.nix
index 8df48e1..a7f8700 100644
--- a/hosts/cryodev-main/services/sops.nix
+++ b/hosts/cryodev-main/services/sops.nix
@@ -13,9 +13,11 @@
   sops = {
     defaultSopsFile = ../secrets.yaml;
     # age.keyFile is not set, sops-nix defaults to using /etc/ssh/ssh_host_ed25519_key
-    secrets = {
-      "forgejo-runner/token" = { };
-      "tailscale/auth-key" = { };
-    };
+
+    # TODO: Enable after first install when SOPS secrets are configured
+    # secrets = {
+    #   "forgejo-runner/token" = { };
+    #   "tailscale/auth-key" = { };
+    # };
   };
 }
diff --git a/hosts/cryodev-pi/services/default.nix b/hosts/cryodev-pi/services/default.nix
index e4c52d5..55c0242 100644
--- a/hosts/cryodev-pi/services/default.nix
+++ b/hosts/cryodev-pi/services/default.nix
@@ -1,9 +1,11 @@
 {
   imports = [
+    # TODO: Enable after first install when SOPS secrets are configured
+    # ./tailscale.nix
+    # ./netdata.nix
+    # ./comin.nix
+
     ./nginx.nix
     ./openssh.nix
-    ./tailscale.nix
-    ./netdata.nix
-    ./comin.nix
   ];
 }