diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index aadc46d..50b1ea5 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -25,6 +25,9 @@
     }
   ];
   defaultModules = baseModules ++ customModules;
+  deployment = {
+    allowLocalDeployment = true;
+  };
 in {
-  toscano = import ./hosts/toscano.nix;
+  #toscano = import ./hosts/toscano/configuration.nix;
 }
diff --git a/hosts/toscano.nix b/nixos/hosts/toscano/configuration.nix
similarity index 51%
rename from hosts/toscano.nix
rename to nixos/hosts/toscano/configuration.nix
index 3811812..69eaedf 100644
--- a/hosts/toscano.nix
+++ b/nixos/hosts/toscano/configuration.nix
@@ -8,14 +8,14 @@
   ...
 }: {
   imports = [
-    ../networks/linode.nix
-    ../profiles/forgejo.nix
-    ../profiles/hakyll-skeleton.nix
-    ../profiles/jfdic-web.nix
-    ../profiles/resrok-web.nix
-    ../profiles/tmateServer.nix
-    ../profiles/voc-web.nix
-    ../secrets/forgejo.nix
+    ../../../networks/linode.nix
+    ../../../profiles/gitea.nix
+    ../../../profiles/hakyll-skeleton.nix
+    ../../../profiles/jfdic-web.nix
+    ../../../profiles/resrok-web.nix
+    ../../../profiles/tmateServer.nix
+    ../../../profiles/voc-web.nix
+    ../../../secrets/gitea.nix
   ];
 
   deployment.targetHost = "45.79.236.198";
diff --git a/outputs.nix b/outputs.nix
index 736c0af..d4ab031 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -23,34 +23,19 @@ in {
     };
 }))
 // {
-  nixopsConfigurations.default = {
-    inherit nixpkgs;
-    network = {
-      description = "jfdic-ops nodes";
-      enableRollback = true;
-      storage.legacy = {
-        databasefile = "~/.nixops/deployments.nixops";
+  colmena = {
+    meta = {
+      description = "jfdi collective's NixOS deployment";
+      name = "jfdic-ops";
+      nixpkgs = import nixpkgs {
+        system = "x86_64-linux";
+        overlays = [];
       };
     };
-    defaults = {
-      system.autoUpgrade.enable = false; # Disabled as it conflicts with NixOps
-      _module.args.inputs = inputs; # make flake inputs accessiable in NixOS
-      imports = [./profiles/host_common.nix];
-    };
-    toscano = import ./hosts/toscano.nix;
-    colmena = {
-      meta = {
-        description = "jfdic-ops deployment";
-        name = "jfdic-ops";
-        nixpkgs = import nixpkgs {
-          system = "x86_64-linux";
-          overlays = [];
-        };
-      };
-      nixosConfigurations = import ./nixos/configurations.nix (inputs
-        // {
-          inherit inputs;
-        });
-    };
+    toscano = import ./nixos/hosts/toscano/configuration.nix;
+    nixosConfigurations = import ./nixos/configurations.nix (inputs
+      // {
+        inherit inputs;
+      });
   };
 }
diff --git a/profiles/server_common.nix b/profiles/server_common.nix
index cad1c54..75e240d 100644
--- a/profiles/server_common.nix
+++ b/profiles/server_common.nix
@@ -7,8 +7,8 @@
 }: {
   imports = [
     ../profiles/openssh.nix
-    ../secrets/user-fiscalvelvetpoet.nix
-    ../secrets/user-root.nix
+    ../nixos/secrets/user-fiscalvelvetpoet.nix
+    ../nixos/secrets/user-root.nix
   ];
 
   programs.mosh = {