diff --git a/jobs/k3s-agent/templates/bin/post-stop.erb b/jobs/k3s-agent/templates/bin/post-stop.erb
index 84161343..a714cfb2 100644
--- a/jobs/k3s-agent/templates/bin/post-stop.erb
+++ b/jobs/k3s-agent/templates/bin/post-stop.erb
@@ -4,8 +4,11 @@
 <% if_p('k3s.do-not-killall-on-post-stop') do |value| %>
 <% if p('k3s.do-not-killall-on-post-stop') %>
 echo "post-stop: SKIP k3s-killall.sh"
+exit 0
+
 <% else %>
 echo "post-stop: k3s-killall.sh to clean the host"
 /var/vcap/jobs/k3s-agent/bin/k3s-killall.sh
+exit 0
 <% end %>
 <% end %>
diff --git a/jobs/k3s-server/templates/bin/post-stop.erb b/jobs/k3s-server/templates/bin/post-stop.erb
index 84161343..de769abb 100644
--- a/jobs/k3s-server/templates/bin/post-stop.erb
+++ b/jobs/k3s-server/templates/bin/post-stop.erb
@@ -4,8 +4,10 @@
 <% if_p('k3s.do-not-killall-on-post-stop') do |value| %>
 <% if p('k3s.do-not-killall-on-post-stop') %>
 echo "post-stop: SKIP k3s-killall.sh"
+exit 0
 <% else %>
 echo "post-stop: k3s-killall.sh to clean the host"
 /var/vcap/jobs/k3s-agent/bin/k3s-killall.sh
+exit 0
 <% end %>
 <% end %>