diff --git a/docker/nailgun/start.sh b/docker/nailgun/start.sh
index ede5adb30..996809d0d 100644
--- a/docker/nailgun/start.sh
+++ b/docker/nailgun/start.sh
@@ -10,4 +10,5 @@ ln -sf /etc/fuel/version.yaml /etc/nailgun/version.yaml
 #Run puppet to apply custom config
 puppet apply -v /etc/puppet/modules/nailgun/examples/nailgun-only.pp
 
+service supervisord stop
 /usr/bin/supervisord -n
diff --git a/docker/ostf/start.sh b/docker/ostf/start.sh
index 5af55966f..8815ceff5 100644
--- a/docker/ostf/start.sh
+++ b/docker/ostf/start.sh
@@ -6,4 +6,5 @@ rm -f /var/lib/rpm/__db.*
 rpm --rebuilddb
 
 puppet apply -v /etc/puppet/modules/nailgun/examples/ostf-only.pp
+service supervisord stop
 /usr/bin/supervisord -n