diff --git a/tools/deployment/component/glance/glance.sh b/tools/deployment/component/glance/glance.sh
index feb237a6a7..e3b4507821 100755
--- a/tools/deployment/component/glance/glance.sh
+++ b/tools/deployment/component/glance/glance.sh
@@ -23,29 +23,12 @@ make glance
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-: ${OSH_OPENSTACK_RELEASE:="ocata"}
 : ${GLANCE_BACKEND:="pvc"}
 tee /tmp/glance.yaml <<EOF
 storage: ${GLANCE_BACKEND}
 volume:
   class_name: standard
 EOF
-if [ "x${OSH_OPENSTACK_RELEASE}" == "xnewton" ]; then
-# NOTE(portdirect): glance APIv1 is required for heat in Newton
-  tee -a /tmp/glance.yaml <<EOF
-conf:
-  glance:
-    DEFAULT:
-      enable_v1_api: true
-      enable_v2_registry: true
-manifests:
-  deployment_registry: true
-  ingress_registry: true
-  pdb_registry: true
-  service_ingress_registry: true
-  service_registry: true
-EOF
-fi
 helm upgrade --install glance ./glance \
   --namespace=openstack \
   --values=/tmp/glance.yaml \
diff --git a/tools/deployment/developer/ceph/120-glance.sh b/tools/deployment/developer/ceph/120-glance.sh
index 6a75cf1631..ef0221c808 100755
--- a/tools/deployment/developer/ceph/120-glance.sh
+++ b/tools/deployment/developer/ceph/120-glance.sh
@@ -14,37 +14,14 @@
 
 set -xe
 
-#NOTE: Lint and package chart
 make glance
 
-#NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-: ${OSH_OPENSTACK_RELEASE:="newton"}
-#NOTE(portdirect), this could be: radosgw, rbd, swift or pvc
 : ${GLANCE_BACKEND:="swift"}
-
-#NOTE: Get the over-rides to use
 : ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(./tools/deployment/common/get-values-overrides.sh glance)"}
-
 tee /tmp/glance.yaml <<EOF
 storage: ${GLANCE_BACKEND}
 EOF
-if [ "x${OSH_OPENSTACK_RELEASE}" == "xnewton" ]; then
-# NOTE(portdirect): glance APIv1 is required for heat in Newton
-  tee -a /tmp/glance.yaml <<EOF
-conf:
-  glance:
-    DEFAULT:
-      enable_v1_api: true
-      enable_v2_registry: true
-manifests:
-  deployment_registry: true
-  ingress_registry: true
-  pdb_registry: true
-  service_ingress_registry: true
-  service_registry: true
-EOF
-fi
 helm upgrade --install glance ./glance \
   --namespace=openstack \
   --values=/tmp/glance.yaml \
@@ -52,10 +29,8 @@ helm upgrade --install glance ./glance \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_GLANCE}
 
-#NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
 export OS_CLOUD=openstack_helm
 openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
diff --git a/tools/deployment/developer/nfs/120-glance.sh b/tools/deployment/developer/nfs/120-glance.sh
index ac7caf379c..3a1ce9814b 100755
--- a/tools/deployment/developer/nfs/120-glance.sh
+++ b/tools/deployment/developer/nfs/120-glance.sh
@@ -22,27 +22,10 @@ make glance
 
 #NOTE: Deploy command
 : ${OSH_EXTRA_HELM_ARGS:=""}
-: ${OSH_OPENSTACK_RELEASE:="newton"}
 : ${GLANCE_BACKEND:="pvc"}
 tee /tmp/glance.yaml <<EOF
 storage: ${GLANCE_BACKEND}
 EOF
-if [ "x${OSH_OPENSTACK_RELEASE}" == "xnewton" ]; then
-# NOTE(portdirect): glance APIv1 is required for heat in Newton
-  tee -a /tmp/glance.yaml <<EOF
-conf:
-  glance:
-    DEFAULT:
-      enable_v1_api: true
-      enable_v2_registry: true
-manifests:
-  deployment_registry: true
-  ingress_registry: true
-  pdb_registry: true
-  service_ingress_registry: true
-  service_registry: true
-EOF
-fi
 helm upgrade --install glance ./glance \
   --namespace=openstack \
   --values=/tmp/glance.yaml \