diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index a436a06621..19adf01e4f 100644
--- a/cinder/Chart.yaml
+++ b/cinder/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Cinder
 name: cinder
-version: 0.2.14
+version: 0.2.15
 home: https://docs.openstack.org/cinder/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
 sources:
diff --git a/cinder/values.yaml b/cinder/values.yaml
index 9882d30c17..4ae16ecee3 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -1312,21 +1312,6 @@ endpoints:
       api:
         default: 9292
         public: 80
-  image_registry:
-    name: glance-registry
-    hosts:
-      default: glance-registry
-      public: glance-reg
-    host_fqdn_override:
-      default: null
-    path:
-      default: null
-    scheme:
-      default: 'http'
-    port:
-      api:
-        default: 9191
-        public: 80
   volumev3:
     name: cinder
     hosts:
diff --git a/doc/source/devref/endpoints.rst b/doc/source/devref/endpoints.rst
index 793d2e238a..069f35ec2f 100644
--- a/doc/source/devref/endpoints.rst
+++ b/doc/source/devref/endpoints.rst
@@ -31,7 +31,6 @@ endpoints are defined:
         scheme: 'http'
         port:
           api: 9292
-          registry: 9191
       compute:
         hosts:
           default: nova-api
@@ -93,9 +92,7 @@ built into the go/sprig templating library used by Helm):
    OpenStack.
 -  internal: This is the OpenStack endpoint type we are looking for -
    valid values would be ``internal``, ``admin``, and ``public``
--  api: This is the port to map to for the service. Some components,
-   such as glance, provide an ``api`` port and a ``registry`` port, for
-   example.
+-  api: This is the port to map to for the service.
 
 Charts should not use hard coded values such as
 ``http://keystone-api:5000`` because these are not compatible with
diff --git a/doc/source/testing/ceph-node-resiliency.rst b/doc/source/testing/ceph-node-resiliency.rst
index 5169dad91e..05b98f34bd 100644
--- a/doc/source/testing/ceph-node-resiliency.rst
+++ b/doc/source/testing/ceph-node-resiliency.rst
@@ -283,8 +283,6 @@ Step 1: Initial Ceph and OpenStack deployment
   cinder-volume-79b9bd8bb9-qsxdk                 1/1       Running   0          12m       192.168.4.40    mnode2
   glance-api-676fd49d4d-j4bdb                    1/1       Running   0          16m       192.168.3.37    mnode3
   glance-api-676fd49d4d-wtxqt                    1/1       Running   0          16m       192.168.4.31    mnode2
-  glance-registry-6f45f5bcf7-lhnrs               1/1       Running   0          16m       192.168.3.34    mnode3
-  glance-registry-6f45f5bcf7-pbsnl               1/1       Running   0          16m       192.168.0.196   mnode1
   ingress-7b4bc84cdd-9fs78                       1/1       Running   0          1h        192.168.5.3     mnode4
   ingress-7b4bc84cdd-wztz7                       1/1       Running   0          1h        192.168.1.4     mnode6
   ingress-error-pages-586c7f86d6-2jl5q           1/1       Running   0          1h        192.168.2.4     mnode5
@@ -328,7 +326,6 @@ In this test env, let's shutdown ``mnode3`` node.
   kube-system                kube-proxy-gqpz5                            0 (0%)        0 (0%)      0 (0%)           0 (0%)
   openstack                  cinder-api-66f4f9678-2lgwk                  0 (0%)        0 (0%)      0 (0%)           0 (0%)
   openstack                  glance-api-676fd49d4d-j4bdb                 0 (0%)        0 (0%)      0 (0%)           0 (0%)
-  openstack                  glance-registry-6f45f5bcf7-lhnrs            0 (0%)        0 (0%)      0 (0%)           0 (0%)
   openstack                  ingress-error-pages-586c7f86d6-455j5        0 (0%)        0 (0%)      0 (0%)           0 (0%)
   openstack                  keystone-api-5bcc7cb698-vvwwr               0 (0%)        0 (0%)      0 (0%)           0 (0%)
   openstack                  mariadb-ingress-84894687fd-dfnkm            0 (0%)        0 (0%)      0 (0%)           0 (0%)
@@ -592,9 +589,6 @@ In this test env, let's shutdown ``mnode3`` node.
   glance-api-676fd49d4d-4tnm6                    1/1       Running   0          1m        192.168.0.212   mnode1
   glance-api-676fd49d4d-j4bdb                    1/1       Unknown   0          26m       192.168.3.37    mnode3
   glance-api-676fd49d4d-wtxqt                    1/1       Running   0          26m       192.168.4.31    mnode2
-  glance-registry-6f45f5bcf7-7s8dn               1/1       Running   0          1m        192.168.4.46    mnode2
-  glance-registry-6f45f5bcf7-lhnrs               1/1       Unknown   0          26m       192.168.3.34    mnode3
-  glance-registry-6f45f5bcf7-pbsnl               1/1       Running   0          26m       192.168.0.196   mnode1
   ingress-7b4bc84cdd-9fs78                       1/1       Running   0          1h        192.168.5.3     mnode4
   ingress-7b4bc84cdd-wztz7                       1/1       Running   0          1h        192.168.1.4     mnode6
   ingress-error-pages-586c7f86d6-2jl5q           1/1       Running   0          1h        192.168.2.4     mnode5
@@ -886,9 +880,6 @@ After applying labels, let's check status
   glance-api-676fd49d4d-4tnm6                    1/1       Running   0          11m       192.168.0.212   mnode1
   glance-api-676fd49d4d-j4bdb                    1/1       Unknown   0          36m       192.168.3.37    mnode3
   glance-api-676fd49d4d-wtxqt                    1/1       Running   0          36m       192.168.4.31    mnode2
-  glance-registry-6f45f5bcf7-7s8dn               1/1       Running   0          11m       192.168.4.46    mnode2
-  glance-registry-6f45f5bcf7-lhnrs               1/1       Unknown   0          36m       192.168.3.34    mnode3
-  glance-registry-6f45f5bcf7-pbsnl               1/1       Running   0          36m       192.168.0.196   mnode1
   ingress-7b4bc84cdd-9fs78                       1/1       Running   0          1h        192.168.5.3     mnode4
   ingress-7b4bc84cdd-wztz7                       1/1       Running   0          1h        192.168.1.4     mnode6
   ingress-error-pages-586c7f86d6-2jl5q           1/1       Running   0          1h        192.168.2.4     mnode5
@@ -1217,9 +1208,6 @@ Above output shows Ceph cluster in HEALTH_OK with all OSDs and MONs up and runni
   glance-api-676fd49d4d-4tnm6                    1/1       Running   0          26m       192.168.0.212   mnode1
   glance-api-676fd49d4d-j4bdb                    1/1       Unknown   0          51m       192.168.3.37    mnode3
   glance-api-676fd49d4d-wtxqt                    1/1       Running   0          51m       192.168.4.31    mnode2
-  glance-registry-6f45f5bcf7-7s8dn               1/1       Running   0          26m       192.168.4.46    mnode2
-  glance-registry-6f45f5bcf7-lhnrs               1/1       Unknown   0          51m       192.168.3.34    mnode3
-  glance-registry-6f45f5bcf7-pbsnl               1/1       Running   0          51m       192.168.0.196   mnode1
   ingress-7b4bc84cdd-9fs78                       1/1       Running   0          2h        192.168.5.3     mnode4
   ingress-7b4bc84cdd-wztz7                       1/1       Running   0          2h        192.168.1.4     mnode6
   ingress-error-pages-586c7f86d6-2jl5q           1/1       Running   0          2h        192.168.2.4     mnode5
diff --git a/doc/source/testing/ceph-upgrade.rst b/doc/source/testing/ceph-upgrade.rst
index 4e8d561aeb..9e75198182 100644
--- a/doc/source/testing/ceph-upgrade.rst
+++ b/doc/source/testing/ceph-upgrade.rst
@@ -270,8 +270,6 @@ Continue with OSH multinode guide to install other Openstack charts.
   cinder-volume-75bf4cc9bd-6298x                 1/1       Running   0          51m
   glance-api-68f6df4d5d-q84hs                    1/1       Running   0          1h
   glance-api-68f6df4d5d-qbfwb                    1/1       Running   0          1h
-  glance-registry-5957979dc5-h54tc               1/1       Running   0          1h
-  glance-registry-5957979dc5-sglg7               1/1       Running   0          1h
   ingress-7b4bc84cdd-84dtj                       1/1       Running   0          2h
   ingress-7b4bc84cdd-ws45r                       1/1       Running   0          2h
   ingress-error-pages-586c7f86d6-dlpm2           1/1       Running   0          2h
@@ -493,8 +491,6 @@ pods are running. No interruption to OSH pods.
   cinder-volume-75bf4cc9bd-6298x                 1/1       Running   0          1h
   glance-api-68f6df4d5d-q84hs                    1/1       Running   0          2h
   glance-api-68f6df4d5d-qbfwb                    1/1       Running   0          2h
-  glance-registry-5957979dc5-h54tc               1/1       Running   0          2h
-  glance-registry-5957979dc5-sglg7               1/1       Running   0          2h
   ingress-7b4bc84cdd-84dtj                       1/1       Running   0          2h
   ingress-7b4bc84cdd-ws45r                       1/1       Running   0          2h
   ingress-error-pages-586c7f86d6-dlpm2           1/1       Running   0          2h
diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index f9a6588e03..a491fdfc5f 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Glance
 name: glance
-version: 0.2.10
+version: 0.3.0
 home: https://docs.openstack.org/glance/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
 sources:
diff --git a/glance/templates/bin/_glance-registry.sh.tpl b/glance/templates/bin/_glance-registry.sh.tpl
deleted file mode 100644
index 397a9a8f83..0000000000
--- a/glance/templates/bin/_glance-registry.sh.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-{{/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-set -ex
-COMMAND="${@:-start}"
-
-function start () {
-  exec glance-registry \
-        --config-file /etc/glance/glance-registry.conf
-}
-
-function stop () {
-  kill -TERM 1
-}
-
-$COMMAND
diff --git a/glance/templates/certificates.yaml b/glance/templates/certificates.yaml
index 55f3751ba1..deb2a237f7 100644
--- a/glance/templates/certificates.yaml
+++ b/glance/templates/certificates.yaml
@@ -14,5 +14,4 @@ limitations under the License.
 
 {{- if .Values.manifests.certificates -}}
 {{  dict "envAll" . "service" "image" "type" "internal" | include "helm-toolkit.manifests.certificates" }}
-{{  dict "envAll" . "service" "image_registry" "type" "internal" | include "helm-toolkit.manifests.certificates" }}
 {{- end -}}
diff --git a/glance/templates/configmap-bin.yaml b/glance/templates/configmap-bin.yaml
index 14638eeeab..2c840defeb 100644
--- a/glance/templates/configmap-bin.yaml
+++ b/glance/templates/configmap-bin.yaml
@@ -21,10 +21,6 @@ kind: ConfigMap
 metadata:
   name: glance-bin
 data:
-{{- if .Values.images.local_registry.active }}
-  image-repo-sync.sh: |
-{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }}
-{{- end }}
 {{- if .Values.bootstrap.enabled }}
   bootstrap.sh: |
 {{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
@@ -49,8 +45,6 @@ data:
 {{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
   glance-api.sh: |
 {{ tuple "bin/_glance-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
-  glance-registry.sh: |
-{{ tuple "bin/_glance-registry.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   ceph-keyring.sh: |
 {{ tuple "bin/_ceph-keyring.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
   ceph-admin-keyring.sh: |
diff --git a/glance/templates/configmap-etc.yaml b/glance/templates/configmap-etc.yaml
index 97f19fbcac..52da5a365d 100644
--- a/glance/templates/configmap-etc.yaml
+++ b/glance/templates/configmap-etc.yaml
@@ -18,16 +18,10 @@ limitations under the License.
 {{- if empty .Values.conf.glance.keystone_authtoken.auth_uri -}}
 {{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken "auth_uri" -}}
 {{- end -}}
-{{- if empty .Values.conf.glance_registry.keystone_authtoken.auth_uri -}}
-{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken "auth_uri" -}}
-{{- end -}}
 
 {{- if empty .Values.conf.glance.keystone_authtoken.auth_url -}}
 {{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance.keystone_authtoken "auth_url" -}}
 {{- end -}}
-{{- if empty .Values.conf.glance_registry.keystone_authtoken.auth_url -}}
-{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.glance_registry.keystone_authtoken "auth_url" -}}
-{{- end -}}
 
 {{- if empty .Values.conf.glance.keystone_authtoken.region_name -}}
 {{- $_ := set .Values.conf.glance.keystone_authtoken "region_name" .Values.endpoints.identity.auth.glance.region_name -}}
@@ -48,37 +42,12 @@ limitations under the License.
 {{- $_ := set .Values.conf.glance.keystone_authtoken "password" .Values.endpoints.identity.auth.glance.password -}}
 {{- end -}}
 
-{{- if empty .Values.conf.glance_registry.keystone_authtoken.region_name -}}
-{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "region_name" .Values.endpoints.identity.auth.glance.region_name -}}
-{{- end -}}
-{{- if empty .Values.conf.glance_registry.keystone_authtoken.project_name -}}
-{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "project_name" .Values.endpoints.identity.auth.glance.project_name -}}
-{{- end -}}
-{{- if empty .Values.conf.glance_registry.keystone_authtoken.project_domain_name -}}
-{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.glance.project_domain_name -}}
-{{- end -}}
-{{- if empty .Values.conf.glance_registry.keystone_authtoken.user_domain_name -}}
-{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.glance.user_domain_name -}}
-{{- end -}}
-{{- if empty .Values.conf.glance_registry.keystone_authtoken.username -}}
-{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "username" .Values.endpoints.identity.auth.glance.username -}}
-{{- end -}}
-{{- if empty .Values.conf.glance_registry.keystone_authtoken.password -}}
-{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "password" .Values.endpoints.identity.auth.glance.password -}}
-{{- end -}}
-
 {{- if empty .Values.conf.glance.keystone_authtoken.memcached_servers -}}
 {{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.glance.keystone_authtoken "memcached_servers" -}}
 {{- end -}}
-{{- if empty .Values.conf.glance_registry.keystone_authtoken.memcached_servers -}}
-{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.glance_registry.keystone_authtoken "memcached_servers" -}}
-{{- end -}}
 {{- if empty .Values.conf.glance.keystone_authtoken.memcache_secret_key -}}
 {{- $_ := set .Values.conf.glance.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}}
 {{- end -}}
-{{- if empty .Values.conf.glance_registry.keystone_authtoken.memcache_secret_key -}}
-{{- $_ := set .Values.conf.glance_registry.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}}
-{{- end -}}
 
 {{- if empty .Values.conf.glance.database.connection -}}
 {{- $connection := tuple "oslo_db" "internal" "glance" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" -}}
@@ -88,33 +57,10 @@ limitations under the License.
 {{- $_ := set .Values.conf.glance.database "connection" $connection -}}
 {{- end -}}
 {{- end -}}
-{{- if empty .Values.conf.glance_registry.connection -}}
-{{- $connection := tuple "oslo_db" "internal" "glance" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" -}}
-{{- if .Values.manifests.certificates -}}
-{{- $_ := (printf "%s?charset=utf8&ssl_ca=/etc/mysql/certs/ca.crt&ssl_key=/etc/mysql/certs/tls.key&ssl_cert=/etc/mysql/certs/tls.crt&ssl_verify_cert" $connection ) | set .Values.conf.glance_registry.database "connection" -}}
-{{- else -}}
-{{- $_ := set .Values.conf.glance_registry.database "connection" $connection -}}
-{{- end -}}
-{{- end -}}
 
 {{- if empty .Values.conf.glance.DEFAULT.transport_url -}}
 {{- $_ := tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.glance.DEFAULT "transport_url" -}}
 {{- end -}}
-{{- if empty .Values.conf.glance_registry.DEFAULT.transport_url -}}
-{{- $_ := tuple "oslo_messaging" "internal" "glance" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.glance_registry.DEFAULT "transport_url" -}}
-{{- end -}}
-
-{{- if empty .Values.conf.glance.DEFAULT.registry_host -}}
-{{- $imageRegistry := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
-{{- $imageRegistryHostURI := split ":" $imageRegistry -}}
-{{- $_ := $imageRegistryHostURI._0 | set .Values.conf.glance.DEFAULT "registry_host" -}}
-{{- end -}}
-
-{{- if empty .Values.conf.glance.DEFAULT.registry_port -}}
-{{- $imageRegistry := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
-{{- $imageRegistryHostURI := split ":" $imageRegistry -}}
-{{- $_ := $imageRegistryHostURI._1 | set .Values.conf.glance.DEFAULT "registry_port" -}}
-{{- end -}}
 
 {{- if empty .Values.conf.glance.DEFAULT.public_endpoint -}}
 {{- $_ := tuple "image" "public" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.glance.DEFAULT "public_endpoint" -}}
@@ -148,10 +94,6 @@ limitations under the License.
 {{- $_ := tuple "image" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.glance.DEFAULT "bind_port" -}}
 {{- end -}}
 
-{{- if empty .Values.conf.glance_registry.DEFAULT.bind_port -}}
-{{- $_ := tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.glance_registry.DEFAULT "bind_port" -}}
-{{- end -}}
-
 {{- if and (empty .Values.conf.logging.handler_fluent) (has "fluent" .Values.conf.logging.handlers.keys) -}}
 {{- $fluentd_host := tuple "fluentd" "internal" $envAll | include "helm-toolkit.endpoints.hostname_namespaced_endpoint_lookup" }}
 {{- $fluentd_port := tuple "fluentd" "internal" "service" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
@@ -193,8 +135,6 @@ data:
   glance-api.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance | b64enc }}
   logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
   glance-api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
-  glance-registry.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance_registry | b64enc }}
-  glance-registry-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste_registry | b64enc }}
   policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
   api_audit_map.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.api_audit_map | b64enc }}
 {{- include "helm-toolkit.snippets.values_template_renderer" ( dict "envAll" $envAll "template" .Values.conf.swift_store "key" "swift-store.conf" "format" "Secret" ) | indent 2 }}
diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml
deleted file mode 100644
index f771e01322..0000000000
--- a/glance/templates/deployment-registry.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-{{/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-{{- if .Values.manifests.deployment_registry }}
-{{- $envAll := . }}
-
-{{- $mounts_glance_registry := .Values.pod.mounts.glance_registry.glance_registry }}
-{{- $mounts_glance_registry_init := .Values.pod.mounts.glance_registry.init_container }}
-
-{{- $serviceAccountName := "glance-registry" }}
-{{ tuple $envAll "registry" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: glance-registry
-  annotations:
-    {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
-  labels:
-{{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-spec:
-  replicas: {{ .Values.pod.replicas.registry }}
-  selector:
-    matchLabels:
-{{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
-{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
-  template:
-    metadata:
-      labels:
-{{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
-      annotations:
-{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
-        configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
-        configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
-{{ dict "envAll" $envAll "podName" "glance-registry" "containerNames" ( list "glance-registry" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
-    spec:
-      serviceAccountName: {{ $serviceAccountName }}
-{{ dict "envAll" $envAll "application" "glance" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
-      affinity:
-{{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
-      nodeSelector:
-        {{ .Values.labels.registry.node_selector_key }}: {{ .Values.labels.registry.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.registry.timeout | default "600" }}
-      initContainers:
-{{ tuple $envAll "registry" $mounts_glance_registry_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
-      containers:
-        - name: glance-registry
-{{ tuple $envAll "glance_registry" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.registry | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-{{ dict "envAll" $envAll "application" "glance" "container" "glance_registry" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
-          command:
-            - /tmp/glance-registry.sh
-            - start
-          lifecycle:
-            preStop:
-              exec:
-                command:
-                  - /tmp/glance-registry.sh
-                  - stop
-          ports:
-            - name: g-reg
-              containerPort: {{ tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-          readinessProbe:
-            tcpSocket:
-              port: {{ tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-          livenessProbe:
-            tcpSocket:
-              port: {{ tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-          volumeMounts:
-            - name: pod-tmp
-              mountPath: /tmp
-            - name: etcglance
-              mountPath: /etc/glance
-            - name: glance-bin
-              mountPath: /tmp/glance-registry.sh
-              subPath: glance-registry.sh
-              readOnly: true
-            - name: glance-etc
-              mountPath: /etc/glance/glance-registry.conf
-              subPath: glance-registry.conf
-              readOnly: true
-            - name: glance-etc
-              mountPath: /etc/glance/api_audit_map.conf
-              subPath: api_audit_map.conf
-              readOnly: true
-            {{- if .Values.conf.glance.DEFAULT.log_config_append }}
-            - name: glance-etc
-              mountPath: {{ .Values.conf.glance.DEFAULT.log_config_append }}
-              subPath: {{ base .Values.conf.glance.DEFAULT.log_config_append }}
-              readOnly: true
-            {{- end }}
-            - name: glance-etc
-              mountPath: /etc/glance/glance-registry-paste.ini
-              subPath: glance-registry-paste.ini
-              readOnly: true
-            - name: glance-etc
-              mountPath: /etc/glance/policy.yaml
-              subPath: policy.yaml
-              readOnly: true
-{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.image_registry.api.internal "path" "/etc/glance/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
-{{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal "path" "/etc/rabbitmq/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
-{{ if $mounts_glance_registry.volumeMounts }}{{ toYaml $mounts_glance_registry.volumeMounts | indent 12 }}{{ end }}
-      volumes:
-        - name: pod-tmp
-          emptyDir: {}
-        - name: etcglance
-          emptyDir: {}
-        - name: glance-bin
-          configMap:
-            name: glance-bin
-            defaultMode: 0555
-        - name: glance-etc
-          secret:
-            secretName: glance-etc
-            defaultMode: 0444
-{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.image_registry.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
-{{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
-{{ if $mounts_glance_registry.volumes }}{{ toYaml $mounts_glance_registry.volumes | indent 8 }}{{ end }}
-{{- end }}
diff --git a/glance/templates/ingress-registry.yaml b/glance/templates/ingress-registry.yaml
deleted file mode 100644
index b9bbaa36ed..0000000000
--- a/glance/templates/ingress-registry.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-{{/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-{{- if and .Values.manifests.ingress_registry .Values.network.registry.ingress.public }}
-{{- $envAll := . }}
-{{- $ingressOpts := dict "envAll" $envAll "backendServiceType" "image_registry" "backendPort" "g-reg" -}}
-{{- $secretName := $envAll.Values.secrets.tls.image_registry.api.internal -}}
-{{- if and .Values.manifests.certificates $secretName -}}
-{{- $_ := set $ingressOpts "certIssuer" .Values.endpoints.image_registry.host_fqdn_override.default.tls.issuerRef.name -}}
-{{- end -}}
-{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
-{{- end }}
diff --git a/glance/templates/pdb-registry.yaml b/glance/templates/pdb-registry.yaml
deleted file mode 100644
index 37c179c859..0000000000
--- a/glance/templates/pdb-registry.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-{{- if .Values.manifests.pdb_registry }}
-{{- $envAll := . }}
----
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  name: glance-registry
-spec:
-  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.registry.min_available }}
-  selector:
-    matchLabels:
-{{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
-{{- end }}
diff --git a/glance/templates/service-ingress-registry.yaml b/glance/templates/service-ingress-registry.yaml
deleted file mode 100644
index 2793ef3899..0000000000
--- a/glance/templates/service-ingress-registry.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-{{- if and .Values.manifests.service_ingress_registry .Values.network.registry.ingress.public }}
-{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "image_registry" -}}
-{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
-{{- end }}
diff --git a/glance/templates/service-registry.yaml b/glance/templates/service-registry.yaml
deleted file mode 100644
index f29e7f7da1..0000000000
--- a/glance/templates/service-registry.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-{{/*
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/}}
-
-{{- if .Values.manifests.service_registry }}
-{{- $envAll := . }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ tuple "image_registry" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-spec:
-  ports:
-  - name: g-reg
-    port: {{ tuple "image_registry" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-    {{ if .Values.network.registry.node_port.enabled }}
-    nodePort: {{ .Values.network.registry.node_port.port }}
-    {{ end }}
-  selector:
-{{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-  {{ if .Values.network.registry.node_port.enabled }}
-  type: NodePort
-  {{ if .Values.network.registry.external_policy_local }}
-  externalTrafficPolicy: Local
-  {{ end }}
-  {{ end }}
-{{- end }}
diff --git a/glance/values.yaml b/glance/values.yaml
index ea3dd8e515..73070e69db 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -26,9 +26,6 @@ labels:
   job:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
-  registry:
-    node_selector_key: openstack-control-plane
-    node_selector_value: enabled
   test:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
@@ -48,7 +45,6 @@ images:
     ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     rabbit_init: docker.io/rabbitmq:3.7-management
     glance_api: docker.io/openstackhelm/glance:stein-ubuntu_bionic
-    glance_registry: docker.io/openstackhelm/glance:stein-ubuntu_bionic
     # Bootstrap image requires curl
     bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
@@ -256,7 +252,6 @@ conf:
       bind_port: null
       workers: 1
       enable_v1_api: False
-      enable_v2_registry: False
     oslo_middleware:
       enable_proxy_headers_parsing: true
     keystone_authtoken:
@@ -358,48 +353,6 @@ conf:
       tags: tag
     service_endpoints:
       image: 'service/storage/image'
-  paste_registry:
-    pipeline:glance-registry:
-      pipeline: healthcheck osprofiler unauthenticated-context registryapp
-    pipeline:glance-registry-keystone:
-      pipeline: healthcheck osprofiler authtoken audit context registryapp
-    pipeline:glance-registry-trusted-auth:
-      pipeline: healthcheck osprofiler context registryapp
-    app:registryapp:
-      paste.app_factory: glance.registry.api:API.factory
-    filter:healthcheck:
-      paste.filter_factory: oslo_middleware:Healthcheck.factory
-      backends: disable_by_file
-      disable_by_file_path: /etc/glance/healthcheck_disable
-    filter:context:
-      paste.filter_factory: glance.api.middleware.context:ContextMiddleware.factory
-    filter:unauthenticated-context:
-      paste.filter_factory: glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
-    filter:authtoken:
-      paste.filter_factory: keystonemiddleware.auth_token:filter_factory
-    filter:osprofiler:
-      paste.filter_factory: osprofiler.web:WsgiMiddleware.factory
-      hmac_keys: SECRET_KEY  # DEPRECATED
-      enabled: yes  # DEPRECATED
-    filter:audit:
-      paste.filter_factory: keystonemiddleware.audit:filter_factory
-      audit_map_file: /etc/glance/api_audit_map.conf
-  glance_registry:
-    DEFAULT:
-      # NOTE(portdirect): the bind port should not be defined, and is manipulated
-      # via the endpoints section.
-      bind_port: null
-      workers: 1
-    keystone_authtoken:
-      auth_type: password
-      auth_version: v3
-      memcache_security_strategy: ENCRYPT
-    paste_deploy:
-      flavor: keystone
-    database:
-      max_retries: -1
-    oslo_messaging_notifications:
-      driver: messagingv2
   swift_store: |
     [{{ .Values.conf.glance.glance_store.default_swift_reference }}]
     {{- if eq .Values.storage "radosgw" }}
@@ -447,18 +400,6 @@ network:
     node_port:
       enabled: false
       port: 30092
-  registry:
-    ingress:
-      public: true
-      classes:
-        namespace: "nginx"
-        cluster: "nginx-cluster"
-      annotations:
-        nginx.ingress.kubernetes.io/rewrite-target: /
-    external_policy_local: false
-    node_port:
-      enabled: false
-      port: 30091
 
 volume:
   class_name: general
@@ -529,20 +470,6 @@ dependencies:
       services:
         - endpoint: internal
           service: oslo_messaging
-    registry:
-      jobs:
-        - glance-storage-init
-        - glance-db-sync
-        - glance-rabbit-init
-        - glance-ks-user
-        - glance-ks-endpoints
-      services:
-        - endpoint: internal
-          service: oslo_db
-        - endpoint: internal
-          service: identity
-        - endpoint: internal
-          service: image
     storage_init:
       jobs:
         - glance-ks-user
@@ -582,10 +509,6 @@ secrets:
       api:
         public: glance-tls-public
         internal: glance-tls-api
-    image_registry:
-      api:
-        public: glance-tls-reg-public
-        internal: glance-tls-reg
 
 # typically overridden by environmental
 # values, but should include all endpoints
@@ -665,21 +588,6 @@ endpoints:
       api:
         default: 9292
         public: 80
-  image_registry:
-    name: glance-registry
-    hosts:
-      default: glance-registry
-      public: glance-reg
-    host_fqdn_override:
-      default: null
-    path:
-      default: null
-    scheme:
-      default: 'http'
-    port:
-      api:
-        default: 9191
-        public: 80
   oslo_db:
     auth:
       admin:
@@ -861,9 +769,6 @@ pod:
         nginx:
           readOnlyRootFilesystem: false
           runAsUser: 0
-        glance_registry:
-          readOnlyRootFilesystem: true
-          allowPrivilegeEscalation: false
     clean:
       pod:
         runAsUser: 42424
@@ -913,11 +818,6 @@ pod:
       glance_api:
         volumeMounts:
         volumes:
-    glance_registry:
-      init_container: null
-      glance_registry:
-        volumeMounts:
-        volumes:
     glance_tests:
       init_container: null
       glance_tests:
@@ -929,7 +829,6 @@ pod:
         volumes:
   replicas:
     api: 1
-    registry: 1
   lifecycle:
     upgrades:
       deployments:
@@ -941,13 +840,9 @@ pod:
     disruption_budget:
       api:
         min_available: 0
-      registry:
-        min_available: 0
     termination_grace_period:
       api:
         timeout: 600
-      registry:
-        timeout: 600
   resources:
     enabled: false
     api:
@@ -957,13 +852,6 @@ pod:
       limits:
         memory: "1024Mi"
         cpu: "2000m"
-    registry:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
     jobs:
       storage_init:
         requests:
@@ -1059,9 +947,7 @@ manifests:
   configmap_bin: true
   configmap_etc: true
   deployment_api: true
-  deployment_registry: false
   ingress_api: true
-  ingress_registry: false
   job_bootstrap: true
   job_clean: true
   job_db_init: true
@@ -1075,7 +961,6 @@ manifests:
   job_metadefs_load: true
   job_rabbit_init: true
   pdb_api: true
-  pdb_registry: false
   pod_rally_test: true
   pvc_images: true
   network_policy: false
@@ -1084,7 +969,5 @@ manifests:
   secret_keystone: true
   secret_rabbitmq: true
   service_ingress_api: true
-  service_ingress_registry: false
   service_api: true
-  service_registry: false
 ...
diff --git a/glance/values_overrides/apparmor.yaml b/glance/values_overrides/apparmor.yaml
index ed6826da49..2ef989bea2 100644
--- a/glance/values_overrides/apparmor.yaml
+++ b/glance/values_overrides/apparmor.yaml
@@ -7,9 +7,6 @@ pod:
       glance-perms: runtime/default
       init: runtime/default
       nginx: runtime/default
-    glance-registry:
-      glance-registry: runtime/default
-      init: runtime/default
     glance-metadefs-load:
       init: runtime/default
       glance-metadefs-load: runtime/default
@@ -21,6 +18,5 @@ pod:
       glance-test: runtime/default
       glance-test-ks-user: runtime/default
 manifests:
-  deployment_registry: true
   certificates: true
 ...
diff --git a/glance/values_overrides/ocata-ubuntu_xenial.yaml b/glance/values_overrides/ocata-ubuntu_xenial.yaml
deleted file mode 100644
index e2c8fad0cd..0000000000
--- a/glance/values_overrides/ocata-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    glance_db_sync: "docker.io/openstackhelm/glance:ocata-ubuntu_xenial"
-    glance_api: "docker.io/openstackhelm/glance:ocata-ubuntu_xenial"
-    glance_registry: "docker.io/openstackhelm/glance:ocata-ubuntu_xenial"
-    glance_metadefs_load: "docker.io/openstackhelm/glance:ocata-ubuntu_xenial"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
-...
diff --git a/glance/values_overrides/pike-ubuntu_xenial.yaml b/glance/values_overrides/pike-ubuntu_xenial.yaml
deleted file mode 100644
index a7515dc00b..0000000000
--- a/glance/values_overrides/pike-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    glance_db_sync: "docker.io/openstackhelm/glance:pike-ubuntu_xenial"
-    glance_api: "docker.io/openstackhelm/glance:pike-ubuntu_xenial"
-    glance_registry: "docker.io/openstackhelm/glance:pike-ubuntu_xenial"
-    glance_metadefs_load: "docker.io/openstackhelm/glance:pike-ubuntu_xenial"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
-...
diff --git a/glance/values_overrides/queens-ubuntu_xenial.yaml b/glance/values_overrides/queens-ubuntu_xenial.yaml
deleted file mode 100644
index ce92f5ee41..0000000000
--- a/glance/values_overrides/queens-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    glance_db_sync: "docker.io/openstackhelm/glance:queens-ubuntu_xenial"
-    glance_api: "docker.io/openstackhelm/glance:queens-ubuntu_xenial"
-    glance_registry: "docker.io/openstackhelm/glance:queens-ubuntu_xenial"
-    glance_metadefs_load: "docker.io/openstackhelm/glance:queens-ubuntu_xenial"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
-...
diff --git a/glance/values_overrides/rocky-opensuse_15.yaml b/glance/values_overrides/rocky-opensuse_15.yaml
deleted file mode 100644
index de6162fe37..0000000000
--- a/glance/values_overrides/rocky-opensuse_15.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    glance_db_sync: "docker.io/openstackhelm/glance:rocky-opensuse_15"
-    glance_api: "docker.io/openstackhelm/glance:rocky-opensuse_15"
-    glance_registry: "docker.io/openstackhelm/glance:rocky-opensuse_15"
-    glance_metadefs_load: "docker.io/openstackhelm/glance:rocky-opensuse_15"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15"
-...
diff --git a/glance/values_overrides/rocky-ubuntu_bionic.yaml b/glance/values_overrides/rocky-ubuntu_bionic.yaml
deleted file mode 100644
index 6215973ee4..0000000000
--- a/glance/values_overrides/rocky-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    db_init: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    db_drop: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    ks_user: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    ks_service: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    ks_endpoints: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    glance_db_sync: "docker.io/openstackhelm/glance:rocky-ubuntu_bionic"
-    glance_api: "docker.io/openstackhelm/glance:rocky-ubuntu_bionic"
-    glance_registry: "docker.io/openstackhelm/glance:rocky-ubuntu_bionic"
-    glance_metadefs_load: "docker.io/openstackhelm/glance:rocky-ubuntu_bionic"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
-...
diff --git a/glance/values_overrides/rocky-ubuntu_xenial.yaml b/glance/values_overrides/rocky-ubuntu_xenial.yaml
deleted file mode 100644
index cf38c03e6c..0000000000
--- a/glance/values_overrides/rocky-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    glance_db_sync: "docker.io/openstackhelm/glance:rocky-ubuntu_xenial"
-    glance_api: "docker.io/openstackhelm/glance:rocky-ubuntu_xenial"
-    glance_registry: "docker.io/openstackhelm/glance:rocky-ubuntu_xenial"
-    glance_metadefs_load: "docker.io/openstackhelm/glance:rocky-ubuntu_xenial"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
-...
diff --git a/glance/values_overrides/tls.yaml b/glance/values_overrides/tls.yaml
index 27c11f57dd..385f9d054a 100644
--- a/glance/values_overrides/tls.yaml
+++ b/glance/values_overrides/tls.yaml
@@ -16,14 +16,6 @@ conf:
       ssl_ca_file: /etc/rabbitmq/certs/ca.crt
       ssl_cert_file: /etc/rabbitmq/certs/tls.crt
       ssl_key_file: /etc/rabbitmq/certs/tls.key
-  glance_registry:
-    keystone_authtoken:
-      cafile: /etc/glance/certs/ca.crt
-    oslo_messaging_rabbit:
-      ssl: true
-      ssl_ca_file: /etc/rabbitmq/certs/ca.crt
-      ssl_cert_file: /etc/rabbitmq/certs/tls.crt
-      ssl_key_file: /etc/rabbitmq/certs/tls.key
   nginx: |
     worker_processes 1;
     daemon off;
@@ -75,10 +67,6 @@ network:
     ingress:
       annotations:
         nginx.ingress.kubernetes.io/backend-protocol: "https"
-  registry:
-    ingress:
-      annotations:
-        nginx.ingress.kubernetes.io/backend-protocol: "https"
 
 endpoints:
   identity:
@@ -109,20 +97,6 @@ endpoints:
     port:
       api:
         public: 443
-  image_registry:
-    host_fqdn_override:
-      default:
-        tls:
-          secretName: glance-tls-reg
-          issuerRef:
-            name: ca-issuer
-            kind: ClusterIssuer
-    scheme:
-      default: https
-      public: https
-    port:
-      api:
-        public: 443
   dashboard:
     scheme:
       default: https
diff --git a/glance/values_overrides/train-ubuntu_bionic.yaml b/glance/values_overrides/train-ubuntu_bionic.yaml
index 6d5a958875..5ecc60b253 100644
--- a/glance/values_overrides/train-ubuntu_bionic.yaml
+++ b/glance/values_overrides/train-ubuntu_bionic.yaml
@@ -9,7 +9,6 @@ images:
     ks_endpoints: "docker.io/openstackhelm/heat:train-ubuntu_bionic"
     glance_db_sync: "docker.io/openstackhelm/glance:train-ubuntu_bionic"
     glance_api: "docker.io/openstackhelm/glance:train-ubuntu_bionic"
-    glance_registry: "docker.io/openstackhelm/glance:train-ubuntu_bionic"
     glance_metadefs_load: "docker.io/openstackhelm/glance:train-ubuntu_bionic"
     glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
 ...
diff --git a/glance/values_overrides/ussuri-ubuntu_bionic.yaml b/glance/values_overrides/ussuri-ubuntu_bionic.yaml
index 93cab0ecf7..0efc908109 100644
--- a/glance/values_overrides/ussuri-ubuntu_bionic.yaml
+++ b/glance/values_overrides/ussuri-ubuntu_bionic.yaml
@@ -9,7 +9,6 @@ images:
     ks_endpoints: "docker.io/openstackhelm/heat:ussuri-ubuntu_bionic"
     glance_db_sync: "docker.io/openstackhelm/glance:ussuri-ubuntu_bionic"
     glance_api: "docker.io/openstackhelm/glance:ussuri-ubuntu_bionic"
-    glance_registry: "docker.io/openstackhelm/glance:ussuri-ubuntu_bionic"
     glance_metadefs_load: "docker.io/openstackhelm/glance:ussuri-ubuntu_bionic"
     glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
 ...
diff --git a/glance/values_overrides/victoria-ubuntu_focal.yaml b/glance/values_overrides/victoria-ubuntu_focal.yaml
index f2d0526fe1..ff58bb9bb4 100644
--- a/glance/values_overrides/victoria-ubuntu_focal.yaml
+++ b/glance/values_overrides/victoria-ubuntu_focal.yaml
@@ -9,7 +9,6 @@ images:
     ks_endpoints: "docker.io/openstackhelm/heat:victoria-ubuntu_focal"
     glance_db_sync: "docker.io/openstackhelm/glance:victoria-ubuntu_focal"
     glance_api: "docker.io/openstackhelm/glance:victoria-ubuntu_focal"
-    glance_registry: "docker.io/openstackhelm/glance:victoria-ubuntu_focal"
     glance_metadefs_load: "docker.io/openstackhelm/glance:victoria-ubuntu_focal"
     glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
 ...
diff --git a/glance/values_overrides/wallaby-ubuntu_focal.yaml b/glance/values_overrides/wallaby-ubuntu_focal.yaml
index 73c0b2c2ac..cf8a1ebf71 100644
--- a/glance/values_overrides/wallaby-ubuntu_focal.yaml
+++ b/glance/values_overrides/wallaby-ubuntu_focal.yaml
@@ -9,7 +9,6 @@ images:
     ks_endpoints: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal"
     glance_db_sync: "docker.io/openstackhelm/glance:wallaby-ubuntu_focal"
     glance_api: "docker.io/openstackhelm/glance:wallaby-ubuntu_focal"
-    glance_registry: "docker.io/openstackhelm/glance:wallaby-ubuntu_focal"
     glance_metadefs_load: "docker.io/openstackhelm/glance:wallaby-ubuntu_focal"
     glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
 ...
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index db1b5c93dd..39fe36603a 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/releasenotes/notes/cinder.yaml
@@ -31,4 +31,5 @@ cinder:
   - 0.2.12 Remove cinder v1/v2 defaults
   - 0.2.13 Upgrade default images to ussuri
   - 0.2.14 Fix notifications
+  - 0.2.15 Remove glance registry
 ...
diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml
index 603714fd53..072a223096 100644
--- a/releasenotes/notes/glance.yaml
+++ b/releasenotes/notes/glance.yaml
@@ -20,4 +20,5 @@ glance:
   - 0.2.8 Helm 3 - Fix Job Labels
   - 0.2.9 Helm 3 - Fix More Job Labels
   - 0.2.10 Update htk requirements repo
+  - 0.3.0 Remove glance registry
 ...
diff --git a/tools/deployment/multinode/100-glance.sh b/tools/deployment/multinode/100-glance.sh
index ce7ef88a67..3c4374e5bf 100755
--- a/tools/deployment/multinode/100-glance.sh
+++ b/tools/deployment/multinode/100-glance.sh
@@ -29,7 +29,6 @@ storage: ${GLANCE_BACKEND}
 pod:
   replicas:
     api: 1
-    registry: 2
 EOF
 
 helm upgrade --install glance ./glance \