diff --git a/providers/container.rb b/providers/container.rb
index 4f1f36b5eb..d12cd20362 100644
--- a/providers/container.rb
+++ b/providers/container.rb
@@ -411,8 +411,11 @@ def service_init
   if new_resource.init_type == 'runit'
     runit_service service_name do
       run_template_name 'docker-container'
-      supports :restart => true, :reload => true, :status => true
+      finish_script_template_name 'docker-container'
+      supports :restart => true, :reload => true, :status => true, :stop => true
       action :nothing
+      finish true
+      restart_on_update false
     end
   else
     service service_name do
diff --git a/templates/default/sv-docker-container-finish.erb b/templates/default/sv-docker-container-finish.erb
new file mode 100644
index 0000000000..4095bba93f
--- /dev/null
+++ b/templates/default/sv-docker-container-finish.erb
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+<%= Docker::Helpers.executable(node) %> stop <%= @options['service_name'] %>
+