diff --git a/deployment/glance/glance-registry-disabled-puppet.yaml b/deployment/glance/glance-registry-disabled-puppet.yaml
deleted file mode 100644
index cd2c70f91a..0000000000
--- a/deployment/glance/glance-registry-disabled-puppet.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  OpenStack Glance Registry service, disabled since ocata
-
-parameters:
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-
-outputs:
-  role_data:
-    description: Role data for the disabled Glance Registry role.
-    value:
-      service_name: glance_registry_disabled
-      upgrade_tasks: []
-      fast_forward_upgrade_tasks:
-        - when:
-            - step|int == 0
-            - release == 'ocata'
-          block:
-            - name: Check if glance_registry is deployed
-              command: systemctl is-enabled --quiet openstack-glance-registry
-              ignore_errors: True
-              register: glance_registry_enabled_result
-            - name: Set fact glance_registry_enabled
-              set_fact:
-                glance_registry_enabled: "{{ glance_registry_enabled_result.rc == 0 }}"
-        - name: Stop openstack-glance-registry
-          service: name=openstack-glance-registry state=stopped enabled=no
-          when:
-            - step|int == 1
-            - release == 'ocata'
-            - glance_registry_enabled|bool
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 9f901336f1..a969ae84c7 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -123,7 +123,6 @@ resource_registry:
   OS::TripleO::Services::Congress: OS::Heat::None
   OS::TripleO::Services::Keystone: deployment/keystone/keystone-container-puppet.yaml
   OS::TripleO::Services::GlanceApi: deployment/glance/glance-api-container-puppet.yaml
-  OS::TripleO::Services::GlanceRegistry: deployment/glance/glance-registry-disabled-puppet.yaml
   OS::TripleO::Services::HeatApi: deployment/heat/heat-api-container-puppet.yaml
   OS::TripleO::Services::HeatApiCfn: deployment/heat/heat-api-cfn-container-puppet.yaml
   OS::TripleO::Services::HeatApiCloudwatch: deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
diff --git a/releasenotes/notes/remove-disabled-glance-registry-2738b41a2e200d95.yaml b/releasenotes/notes/remove-disabled-glance-registry-2738b41a2e200d95.yaml
new file mode 100644
index 0000000000..96cace92e7
--- /dev/null
+++ b/releasenotes/notes/remove-disabled-glance-registry-2738b41a2e200d95.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Removed 'glance-registry' related changes since it's
+    been deprecated from glance & no longer been used.
diff --git a/roles/Controller.yaml b/roles/Controller.yaml
index 610124b68b..24e668ba86 100644
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@@ -86,7 +86,6 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
-    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd
diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml
index 3f349b1c0d..6868b81053 100644
--- a/roles/ControllerAllNovaStandalone.yaml
+++ b/roles/ControllerAllNovaStandalone.yaml
@@ -60,7 +60,6 @@
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::Ipsec
     - OS::TripleO::Services::GlanceApi
-    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd
diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml
index ba77f75a78..32baf793fe 100644
--- a/roles/ControllerNoCeph.yaml
+++ b/roles/ControllerNoCeph.yaml
@@ -79,7 +79,6 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
-    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd
diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml
index 9f148711a0..d8f48616d3 100644
--- a/roles/ControllerNovaStandalone.yaml
+++ b/roles/ControllerNovaStandalone.yaml
@@ -63,7 +63,6 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
-    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd
diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml
index 778844f091..196c9c7b2b 100644
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@@ -65,7 +65,6 @@
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::Ipsec
     - OS::TripleO::Services::GlanceApi
-    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd
diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml
index a7a3c0f126..a8b02c719f 100644
--- a/roles/ControllerStorageNfs.yaml
+++ b/roles/ControllerStorageNfs.yaml
@@ -79,7 +79,6 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
-    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd
diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml
index 0c77bb668c..5ea4fc1ea1 100644
--- a/roles/Standalone.yaml
+++ b/roles/Standalone.yaml
@@ -83,7 +83,6 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
-    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd
diff --git a/roles_data.yaml b/roles_data.yaml
index 32c4e2e781..eebf0e4167 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -89,7 +89,6 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
-    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd