diff --git a/machines/dev/fedi203/default.nix b/machines/dev/fedi203/default.nix
index 0957b4a9..ad2e9d66 100644
--- a/machines/dev/fedi203/default.nix
+++ b/machines/dev/fedi203/default.nix
@@ -17,10 +17,4 @@
       gateway = "2a00:51c0:13:1305::1";
     };
   };
-
-  nixos.module = {
-    imports = [
-      ../forgejo-ci/woodpecker.nix
-    ];
-  };
 }
diff --git a/machines/dev/forgejo-ci/default.nix b/machines/dev/forgejo-ci/default.nix
index fc520136..0f5524d9 100644
--- a/machines/dev/forgejo-ci/default.nix
+++ b/machines/dev/forgejo-ci/default.nix
@@ -39,7 +39,7 @@ in
       _class = "nixos";
 
       imports = [
-        ./forgejo-actions-runner.nix
+        ./woodpecker.nix
       ];
 
       hardware.cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/machines/dev/forgejo-ci/forgejo-actions-runner.nix b/machines/dev/forgejo-ci/forgejo-actions-runner.nix
deleted file mode 100644
index bb6928cc..00000000
--- a/machines/dev/forgejo-ci/forgejo-actions-runner.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-  _class = "nixos";
-
-  services.gitea-actions-runner = {
-    package = pkgs.forgejo-actions-runner;
-
-    instances.default = {
-      enable = true;
-
-      name = config.networking.fqdn;
-      url = "https://git.fediversity.eu";
-      tokenFile = config.age.secrets.forgejo-runner-token.path;
-
-      settings = {
-        log.level = "info";
-        runner = {
-          file = ".runner";
-          # Take only 1 job at a time to avoid clashing NixOS tests, see #362
-          capacity = 1;
-          timeout = "3h";
-          insecure = false;
-          fetch_timeout = "5s";
-          fetch_interval = "2s";
-        };
-      };
-
-      ## This runner supports Docker (with a default Ubuntu image) and native
-      ## modes. In native mode, it contains a few default packages.
-      labels = [
-        "docker:docker://node:16-bullseye"
-        "native:host"
-      ];
-
-      hostPackages = with pkgs; [
-        bash
-        git
-        nix
-        nodejs
-      ];
-    };
-  };
-
-  ## For the Docker mode of the runner.
-  virtualisation.docker.enable = true;
-}