diff --git a/contrail_provisioning/common/rabbitmq.py b/contrail_provisioning/common/rabbitmq.py
index 0b5eca76..150f2192 100644
--- a/contrail_provisioning/common/rabbitmq.py
+++ b/contrail_provisioning/common/rabbitmq.py
@@ -102,12 +102,12 @@ def listen_at_supervisor_support_port(self):
         is_running = "service supervisor-support-service status | grep running"
         if local(is_running).failed:
             local("service supervisor-support-service start")
-            sock = "unix:///var/run/supervisord_support_service.sock"
-            stop_all = "supervisorctl -s %s stop all" % sock
-            if local(stop_all).failed:
+            if os.path.exists('/tmp/supervisord_support_service.sock'):
+                sock = "unix:///tmp/supervisord_support_service.sock"
+            else:
                 sock = "unix:///var/run/supervisord_support_service.sock"
-                stop_all = "supervisorctl -s %s stop all" % sock
-                local(stop_all)
+            stop_all = "supervisorctl -s %s stop all" % sock
+            local(stop_all)
 
     def remove_mnesia_database(self):
          with settings(warn_only=True):
diff --git a/contrail_provisioning/config/templates/contrail_api_svc.py b/contrail_provisioning/config/templates/contrail_api_svc.py
index 0f980f65..f7f1ab81 100644
--- a/contrail_provisioning/config/templates/contrail_api_svc.py
+++ b/contrail_provisioning/config/templates/contrail_api_svc.py
@@ -8,5 +8,8 @@
 
 $__contrail_supervisorctl_lines__
 
-#supervisorctl -s unix:///tmp/supervisord_config.sock ${1} `basename ${0}`
+#if os.path.exists('/tmp/supervisord_config.sock'):
+#    supervisorctl -s unix:///tmp/supervisord_config.sock ${1} `basename ${0}`
+#else:
+#    supervisorctl -s unix:///var/run/supervisord_config.sock ${1} `basename ${0}`
 """)
diff --git a/contrail_provisioning/config/templates/contrail_discovery_svc.py b/contrail_provisioning/config/templates/contrail_discovery_svc.py
index 0f980f65..f7f1ab81 100644
--- a/contrail_provisioning/config/templates/contrail_discovery_svc.py
+++ b/contrail_provisioning/config/templates/contrail_discovery_svc.py
@@ -8,5 +8,8 @@
 
 $__contrail_supervisorctl_lines__
 
-#supervisorctl -s unix:///tmp/supervisord_config.sock ${1} `basename ${0}`
+#if os.path.exists('/tmp/supervisord_config.sock'):
+#    supervisorctl -s unix:///tmp/supervisord_config.sock ${1} `basename ${0}`
+#else:
+#    supervisorctl -s unix:///var/run/supervisord_config.sock ${1} `basename ${0}`
 """)
diff --git a/contrail_provisioning/openstack/scripts/barbican-server-setup.sh b/contrail_provisioning/openstack/scripts/barbican-server-setup.sh
index e71331d0..d955a3ff 100755
--- a/contrail_provisioning/openstack/scripts/barbican-server-setup.sh
+++ b/contrail_provisioning/openstack/scripts/barbican-server-setup.sh
@@ -174,7 +174,11 @@ if [ $is_xenial -ne 1 ] ; then
     if [ $status == 'stopped' ]; then
         service supervisor-openstack start
         sleep 5
-        supervisorctl -s unix:///tmp/supervisord_openstack.sock stop all
+        if [ -e /tmp/supervisord_openstack.sock ]; then
+            supervisorctl -s unix:///tmp/supervisord_openstack.sock stop all
+        else
+            supervisorctl -s unix:///var/run/supervisord_openstack.sock stop all
+        fi
     fi
 fi