diff --git a/handlers/main.yml b/handlers/main.yml
index 4efc0b3..401cbe1 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -9,6 +9,10 @@
   command: "drone-runner-exec service install"
   when: ansible_service_mgr == "systemd"
 
+- name: "Stop drone runner exec"
+  command: "drone-runner-exec service stop"
+  when: ansible_service_mgr == "systemd"
+
 - name: "Start drone runner exec"
   command: "drone-runner-exec service start"
   when: ansible_service_mgr == "systemd"
diff --git a/tasks/main.yml b/tasks/main.yml
index 0dc7bbd..6fdc6db 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -61,6 +61,7 @@
     - "{{ gitclonerunner.stdout }}"
   notify: 
     - "Install drone runner exec"
+    - "Stop drone runner exec"
     - "Start drone runner exec"
     
 - name: "Make local runner config dir"
@@ -72,6 +73,7 @@
     mode: '0700'
   notify: 
     - "Install drone runner exec"
+    - "Stop drone runner exec"
     - "Start drone runner exec"
 
 - name: "Make local runner config dir"
@@ -83,6 +85,7 @@
     mode: '0700'
   notify: 
     - "Install drone runner exec"
+    - "Stop drone runner exec"
     - "Start drone runner exec"
 
 - name: "Configure local runner"
@@ -94,6 +97,7 @@
     mode: '0700'
   notify: 
     - "Install drone runner exec"
+    - "Stop drone runner exec"
     - "Start drone runner exec"
 
 - name: "Configure drone"