diff --git a/devstack/contrib/new-octavia-devstack.sh b/devstack/contrib/new-octavia-devstack.sh
index 1709818dde..ec2e52ae16 100755
--- a/devstack/contrib/new-octavia-devstack.sh
+++ b/devstack/contrib/new-octavia-devstack.sh
@@ -34,11 +34,11 @@ LOG_COLOR=True
 # Pre-requisite
 ENABLED_SERVICES=key,rabbit,mysql
 # Nova
-ENABLED_SERVICES+=,n-api,n-obj,n-cpu,n-cond,n-sch
+ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch
 # Placement service needed for Nova
 ENABLED_SERVICES+=,placement-api,placement-client
 # Glance
-ENABLED_SERVICES+=,g-api,g-reg
+ENABLED_SERVICES+=,g-api
 # Neutron
 ENABLED_SERVICES+=,neutron-api,neutron-agent,neutron-dhcp,neutron-l3
 ENABLED_SERVICES+=,neutron-metadata-agent,neutron-qos
diff --git a/devstack/samples/multinode/local.conf b/devstack/samples/multinode/local.conf
index cdf8f1da6a..5cb7da4cdc 100644
--- a/devstack/samples/multinode/local.conf
+++ b/devstack/samples/multinode/local.conf
@@ -43,7 +43,6 @@ enable_service placement-client
 
 # Glance
 enable_service g-api
-enable_service g-reg
 
 # Neutron
 enable_service neutron
diff --git a/devstack/samples/singlenode/local.conf b/devstack/samples/singlenode/local.conf
index 6608d732f0..b3f6a23d59 100644
--- a/devstack/samples/singlenode/local.conf
+++ b/devstack/samples/singlenode/local.conf
@@ -56,7 +56,6 @@ enable_service placement-client
 
 # Glance
 enable_service g-api
-enable_service g-reg
 
 # Neutron
 enable_service neutron