diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 19ccd23ae6..62ba6b6d45 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -435,14 +435,12 @@ function create_manila_service_flavor {
 # create_manila_service_image - creates image, that will be used by backends
 # with configured generic driver to boot Nova VMs from.
 function create_manila_service_image {
-    if is_service_enabled nova; then
+    if is_service_enabled nova g-api; then
         TOKEN=$(openstack token issue -c id -f value)
         local image_exists=$( openstack image list | grep " $MANILA_SERVICE_IMAGE_NAME " )
         if [[ -z $image_exists ]]; then
             # Download Manila's image
-            if is_service_enabled g-reg; then
-                upload_image $MANILA_SERVICE_IMAGE_URL $TOKEN
-            fi
+            upload_image $MANILA_SERVICE_IMAGE_URL $TOKEN
         fi
     fi
 }
diff --git a/doc/source/contributor/development-environment-devstack.rst b/doc/source/contributor/development-environment-devstack.rst
index 0f94021480..7b32080d91 100644
--- a/doc/source/contributor/development-environment-devstack.rst
+++ b/doc/source/contributor/development-environment-devstack.rst
@@ -189,7 +189,7 @@ your testing::
 
 Optionally, you can deploy with Manila, Nova, Neutron, Glance and Tempest::
 
-    ENABLED_SERVICES=key,mysql,rabbit,tempest,g-api,g-reg
+    ENABLED_SERVICES=key,mysql,rabbit,tempest,g-api
     ENABLED_SERVICES+=n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,placement-api,placement-client
     ENABLED_SERVICES+=q-svc,q-dhcp,q-meta,q-l3,q-agt
     ENABLED_SERVICES+=tempest
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
index 8205e05c20..1428c75971 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
@@ -73,7 +73,7 @@
           # Basic services needed for minimal job
           OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
           # Enable glance for scenario tests
-          OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg
+          OVERRIDE_ENABLED_SERVICES+=,g-api
           # Enable nova for scenario tests
           OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj
           # Enable neutron for scenario tests
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml
index aa17f4472c..ec5991bfff 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml
@@ -56,7 +56,7 @@
           # Basic services needed for minimal job
           OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
           # Enable glance for scenario tests
-          OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg
+          OVERRIDE_ENABLED_SERVICES+=,g-api
           # Enable nova for scenario tests
           OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj
           # Enable neutron for scenario tests
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
index d7f363ef24..e06901d728 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
@@ -54,7 +54,7 @@
           # Basic services needed for minimal job
           OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
           # Enable glance for scenario tests
-          OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg
+          OVERRIDE_ENABLED_SERVICES+=,g-api
           # Enable nova for scenario tests
           OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj
           # Enable neutron for scenario tests