diff --git a/flake.nix b/flake.nix
index 8569f0e..beb7cdb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,9 +125,6 @@
           inherit specialArgs;
           modules = common_modules ++ [
             ./hosts/monolith
-            ./system/monolith-gitlab-runner.nix
-            ./system/monolith-forgejo-runner.nix
-            ./system/nix-serve.nix
           ];
         };
         double-rainbow = lib.nixosSystem {
diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix
index 0ce3b79..da69746 100644
--- a/hosts/monolith/default.nix
+++ b/hosts/monolith/default.nix
@@ -27,6 +27,8 @@ in
     ./factorio-server.nix
     ./nebula-vpn.nix
     ./minio.nix
+    ./monolith-forgejo-runner.nix
+    ./monolith-gitlab-runner.nix
   ];
   boot.initrd.availableKernelModules = [
     "nvme"
diff --git a/system/monolith-forgejo-runner.nix b/hosts/monolith/monolith-forgejo-runner.nix
similarity index 100%
rename from system/monolith-forgejo-runner.nix
rename to hosts/monolith/monolith-forgejo-runner.nix
diff --git a/system/monolith-gitlab-runner.nix b/hosts/monolith/monolith-gitlab-runner.nix
similarity index 65%
rename from system/monolith-gitlab-runner.nix
rename to hosts/monolith/monolith-gitlab-runner.nix
index e70fd8c..b8eb3df 100644
--- a/system/monolith-gitlab-runner.nix
+++ b/hosts/monolith/monolith-gitlab-runner.nix
@@ -5,7 +5,10 @@
   ...
 }:
 let
-  inherit (pkgs.callPackage ./gitlab-runner.nix { inherit inputs; }) mkNixRunner mkNixRunnerFull;
+  inherit (pkgs.callPackage ../../system/gitlab-runner.nix { inherit inputs; })
+    mkNixRunner
+    mkNixRunnerFull
+    ;
 in
 {
   boot.kernel.sysctl."net.ipv4.ip_forward" = true;
@@ -38,23 +41,11 @@ in
   systemd.services.gitlab-runner.serviceConfig.Nice = 10;
 
   sops.secrets = {
-    "gitlab-runners/thoreb-telemetria-nix" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/thoreb-itinerario-nix" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/docker-images-token" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/wopus-gitlab-nix" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/wopus-ssh-nix-cache-pk" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/wopus-ssh-nix-cache-pub" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
+    "gitlab-runners/thoreb-telemetria-nix" = { };
+    "gitlab-runners/thoreb-itinerario-nix" = { };
+    "gitlab-runners/docker-images-token" = { };
+    "gitlab-runners/wopus-gitlab-nix" = { };
+    "gitlab-runners/wopus-ssh-nix-cache-pk" = { };
+    "gitlab-runners/wopus-ssh-nix-cache-pub" = { };
   };
 }
diff --git a/system/nix-serve.nix b/system/nix-serve.nix
deleted file mode 100644
index 9bf9814..0000000
--- a/system/nix-serve.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  services.nix-serve = {
-    enable = true;
-    secretKeyFile = config.sops.secrets."nix-serve/private-key".path;
-  };
-
-  sops.secrets."nix-serve/private-key" = { };
-}