diff --git a/hosts/fw.cloonar.com/modules/drone/runner.nix b/hosts/fw.cloonar.com/modules/drone/runner.nix
index d0d97d2..f969078 100644
--- a/hosts/fw.cloonar.com/modules/drone/runner.nix
+++ b/hosts/fw.cloonar.com/modules/drone/runner.nix
@@ -24,8 +24,7 @@
       Restart = "always";
       ExecStartPre= ''
         -${pkgs.podman}/bin/podman stop %n \
-        -${pkgs.podman}/bin/podman rm %n \
-        ${pkgs.podman}/bin/podman pull drone/drone:2.20.0
+        ${pkgs.podman}/bin/podman rm %n
       '';
       ExecStart= ''
         ${pkgs.podman}/bin/podman run --rm --name %n \
@@ -34,7 +33,7 @@
         --env=DRONE_RPC_PROTO=https \
         --env=DRONE_RPC_HOST=drone.cloonar.com \
         --env=DRONE_RUNNER_CAPACITY=2 \
-        drone/drone-runner-podman:1.8.3
+        drone/drone-runner-docker:1.8.3
       '';
     };
   };
diff --git a/hosts/fw.cloonar.com/modules/drone/server.nix b/hosts/fw.cloonar.com/modules/drone/server.nix
index b5b4eaa..87c8b52 100644
--- a/hosts/fw.cloonar.com/modules/drone/server.nix
+++ b/hosts/fw.cloonar.com/modules/drone/server.nix
@@ -17,15 +17,13 @@
     path = [ pkgs.podman ];
 
     serviceConfig = {
-      # Type = "simple";
       Name = "drone-server";
       User = "drone-server";
       Group = "drone-server";
       Restart = "always";
       ExecStartPre= ''
         -${pkgs.podman}/bin/podman stop %n \
-        -${pkgs.podman}/bin/podman rm %n \
-        ${pkgs.podman}/bin/podman pull drone/drone:2.20.0
+        ${pkgs.podman}/bin/podman rm %n
       '';
       ExecStart= ''
         ${pkgs.podman}/bin/podman run --rm --name %n \
@@ -39,7 +37,7 @@
         --env=DRONE_USER_CREATE=username:dominik.polakovics,admin:true \
         -v /var/lib/drone:/data \
         --publish=8080:80 \
-        drone/drone:2
+        drone/drone:2.20.0
       '';
     };
   };