diff --git a/snap-overlay/snap-openstack.yaml b/snap-overlay/snap-openstack.yaml
index 3e93050..5bcaa38 100644
--- a/snap-overlay/snap-openstack.yaml
+++ b/snap-overlay/snap-openstack.yaml
@@ -271,14 +271,6 @@ entry_points:
       - "{snap_common}/etc/glance/glance-manage.conf"
     config-dirs:
       - "{snap_common}/etc/glance/glance.conf.d"
-  glance-registry:
-    binary: "{snap}/bin/glance-registry"
-    config-files:
-      - "{snap}/etc/glance/glance-registry.conf"
-    config-files-override:
-      - "{snap_common}/etc/glance/glance-registry.conf"
-    config-dirs:
-      - "{snap_common}/etc/glance/glance.conf.d"
   glance-api:
     binary: "{snap}/bin/glance-api"
     config-files:
diff --git a/snap/hooks/install b/snap/hooks/install
index 76a316f..75fd7f8 100755
--- a/snap/hooks/install
+++ b/snap/hooks/install
@@ -29,7 +29,6 @@ snapctl stop --disable $SNAP_INSTANCE_NAME.horizon-uwsgi
 snapctl stop --disable $SNAP_INSTANCE_NAME.neutron-api
 
 snapctl stop --disable $SNAP_INSTANCE_NAME.glance-api
-snapctl stop --disable $SNAP_INSTANCE_NAME.registry
 
 snapctl stop --disable $SNAP_INSTANCE_NAME.cinder-uwsgi
 snapctl stop --disable $SNAP_INSTANCE_NAME.cinder-scheduler
diff --git a/snapcraft.yaml b/snapcraft.yaml
index edd7f2b..8dda75b 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -223,14 +223,6 @@ apps:
       - mount-observe
       - network-control
       # TODO: - microstack-support
-  registry:
-    command: bin/snap-openstack launch glance-registry
-    daemon: simple
-    plugs:
-      - network
-      - network-bind
-      - network-control
-      # TODO: - microstack-support
   glance-manage:
     command: bin/snap-openstack launch glance-manage
     plugs:
diff --git a/tools/init/init/questions/__init__.py b/tools/init/init/questions/__init__.py
index 595a777..7b2555d 100644
--- a/tools/init/init/questions/__init__.py
+++ b/tools/init/init/questions/__init__.py
@@ -867,13 +867,7 @@ class GlanceSetup(Question):
                       'http://{compute_ip}:9292'.format(**_env))
 
         check('snap-openstack', 'launch', 'glance-manage', 'db_sync')
-        # TODO: remove the glance registry
-        # https://blueprints.launchpad.net/glance/+spec/deprecate-registry
-        for service in [
-                'glance-api',
-                'registry',
-        ]:
-            enable(service)
+        enable('glance-api')
 
         nc_wait(_env['compute_ip'], '9292')
 
@@ -883,7 +877,6 @@ class GlanceSetup(Question):
 
     def no(self, answer):
         disable('glance-api')
-        disable('registry')
 
 
 class SecurityRules(Question):