diff --git a/modules/docker-ci-runner/default.nix b/modules/docker-ci-runner/default.nix
index 4863d970..69decb0b 100644
--- a/modules/docker-ci-runner/default.nix
+++ b/modules/docker-ci-runner/default.nix
@@ -102,5 +102,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
+    '';
   };
 }