diff --git a/nixos/common/services/forgejo-runner.nix b/nixos/common/services/forgejo-runner.nix
index ee1f913f..85a0a184 100644
--- a/nixos/common/services/forgejo-runner.nix
+++ b/nixos/common/services/forgejo-runner.nix
@@ -2,16 +2,18 @@
 
     # Set up the secret for the password:
     sops.secrets."services/forgejo_token" = {
-        owner = "root";
+        owner = "gitea-runner";
         sopsFile = ../../../secrets/secrets.yaml;
     };
 
-    services.gitea-actions-runner.package = pkgs.forgejo-actions-runner;
-    services.gitea-actions-runner.instances."${hostname}" = {
-        enable = true;
-        name = "${hostname}";
-        labels = [ "host://-self-hosted" ];
-        url = "https://git.sysctl.io";
-        tokenFile = "/run/secrets/services/forgejo_token";
+    services.gitea-actions-runner = {
+        package = pkgs.forgejo-actions-runner;
+        instances."${hostname}" = {
+            enable = true;
+            name = "${hostname}";
+            labels = [ "native:host" ];
+            url = "https://git.sysctl.io";
+            tokenFile = "/run/secrets/services/forgejo_token";
+        };
     };
 }
\ No newline at end of file
diff --git a/nixos/hosts/framework-server/default.nix b/nixos/hosts/framework-server/default.nix
index 9825c35e..9537d051 100644
--- a/nixos/hosts/framework-server/default.nix
+++ b/nixos/hosts/framework-server/default.nix
@@ -7,6 +7,7 @@
     ../../common/services/fwupd.nix
     ../../common/modules/ssh-luks.nix
     ../../common/services/docker.nix
+    ../../common/services/forgejo-runner.nix
     ./disks.nix
     ./builder.nix
     ./wireguard.nix