diff --git a/devstack/lib/zun b/devstack/lib/zun
index 5c8603320..bea6fb54b 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -265,7 +265,7 @@ function create_zun_conf {
     iniset $ZUN_CONF etcd etcd_port "$ZUN_ETCD_PORT"
     iniset $ZUN_CONF websocket_proxy wsproxy_port "$ZUN_WEBSOCKET_PROXY_PORT"
     iniset $ZUN_CONF websocket_proxy wsproxy_host "$ZUN_WEBSOCKET_PROXY_IP"
-    iniset $ZUN_CONF api host_ip 0.0.0.0
+    iniset $ZUN_CONF api host_ip "$ZUN_SERVICE_HOST"
     iniset $ZUN_CONF api port "$ZUN_SERVICE_PORT"
 
     iniset $ZUN_CONF oslo_policy policy_file $ZUN_POLICY_JSON
diff --git a/devstack/settings b/devstack/settings
index 0f5a34b7b..94d5f1508 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -16,9 +16,13 @@
 # OVS_PHYSICAL_BRIDGE=br-ex
 
 # Enable Zun services
-enable_service zun-api
-enable_service zun-compute
-enable_service zun-wsproxy
+if [[ ${HOST_IP} == ${SERVICE_HOST} ]]; then
+    enable_service zun-api
+    enable_service zun-compute
+    enable_service zun-wsproxy
+else
+    enable_service zun-compute
+fi
 
 if [[ ${ZUN_DB_TYPE} == "etcd" ]]; then
     enable_service zun-etcd