diff --git a/modules/docker-ci-runner/default.nix b/modules/docker-ci-runner/default.nix
index 6784f294..5e7483b9 100644
--- a/modules/docker-ci-runner/default.nix
+++ b/modules/docker-ci-runner/default.nix
@@ -105,5 +105,10 @@ in {
         };
       };
     };
+    # Fix container not stopping correctly and holding the system 120s upon
+    # shutdown / reboot
+    systemd.services.docker-drone-exec-runner.preStop = ''
+      docker stop drone-exec-runner
+    '';
   };
 }