diff --git a/tools/deployment/armada/manifests/armada-ceph.yaml b/tools/deployment/armada/manifests/armada-ceph.yaml
index 0862c9518d..3a74e25d9f 100644
--- a/tools/deployment/armada/manifests/armada-ceph.yaml
+++ b/tools/deployment/armada/manifests/armada-ceph.yaml
@@ -79,10 +79,6 @@ data:
             release_group: osh-ceph-mon
   values:
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: ceph
       ceph_mon:
         namespace: ceph
     network:
@@ -91,18 +87,12 @@ data:
     deployment:
       storage_secrets: true
       ceph: true
-      rbd_provisioner: true
-      cephfs_provisioner: true
-      client_secrets: false
-      rgw_keystone_user_and_endpoints: false
     bootstrap:
       enabled: true
     conf:
       ceph:
         global:
           fsid: ${CEPH_FS_ID}
-      rgw_ks:
-        enabled: true
       pool:
         crush:
           tunables: ${CRUSH_TUNABLES}
@@ -149,22 +139,13 @@ data:
             release_group: osh-ceph-osd
   values:
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: ceph
       ceph_mon:
         namespace: ceph
     network:
       public: ${CEPH_NETWORK}
       cluster: ${CEPH_NETWORK}
     deployment:
-      storage_secrets: true
       ceph: true
-      rbd_provisioner: true
-      cephfs_provisioner: true
-      client_secrets: false
-      rgw_keystone_user_and_endpoints: false
     bootstrap:
       enabled: true
     conf:
@@ -219,33 +200,19 @@ data:
             release_group: osh-ceph-client
   values:
     endpoints:
-      identity:
-        namespace: openstack
-        auth:
-          swift:
-            password: ${SWIFT_USER_PASSWORD}
-      object_store:
-        namespace: ceph
       ceph_mon:
         namespace: ceph
     network:
       public: ${CEPH_NETWORK}
       cluster: ${CEPH_NETWORK}
     deployment:
-      storage_secrets: true
       ceph: true
-      rbd_provisioner: true
-      cephfs_provisioner: true
-      client_secrets: false
-      rgw_keystone_user_and_endpoints: false
     bootstrap:
       enabled: true
     conf:
       ceph:
         global:
           fsid: ${CEPH_FS_ID}
-      rgw_ks:
-        enabled: true
       pool:
         crush:
           tunables: ${CRUSH_TUNABLES}
@@ -292,33 +259,22 @@ data:
             release_group: osh-ceph-provisioners
   values:
     endpoints:
-      identity:
-        namespace: openstack
-        auth:
-          swift:
-            password: ${SWIFT_USER_PASSWORD}
-      object_store:
-        namespace: ceph
       ceph_mon:
         namespace: ceph
     network:
       public: ${CEPH_NETWORK}
       cluster: ${CEPH_NETWORK}
     deployment:
-      storage_secrets: true
       ceph: true
       rbd_provisioner: true
       cephfs_provisioner: true
       client_secrets: false
-      rgw_keystone_user_and_endpoints: false
     bootstrap:
       enabled: true
     conf:
       ceph:
         global:
           fsid: ${CEPH_FS_ID}
-      rgw_ks:
-        enabled: true
       pool:
         crush:
           tunables: ${CRUSH_TUNABLES}
diff --git a/tools/deployment/armada/manifests/armada-lma.yaml b/tools/deployment/armada/manifests/armada-lma.yaml
index edcbff1138..38de6e3a6f 100644
--- a/tools/deployment/armada/manifests/armada-lma.yaml
+++ b/tools/deployment/armada/manifests/armada-lma.yaml
@@ -75,10 +75,6 @@ data:
             release_group: osh-infra-osh-infra-ceph-config
   values:
     endpoints:
-      identity:
-        namespace: openstack
-      object_store:
-        namespace: ceph
       ceph_mon:
         namespace: ceph
     labels:
@@ -89,17 +85,12 @@ data:
       public: ${CEPH_NETWORK}
       cluster: ${CEPH_NETWORK}
     deployment:
-      storage_secrets: False
       ceph: False
       rbd_provisioner: False
       cephfs_provisioner: False
       client_secrets: True
-      rgw_keystone_user_and_endpoints: False
     bootstrap:
       enabled: False
-    conf:
-      rgw_ks:
-        enabled: True
   source:
     type: local
     location: ${OSH_INFRA_PATH}
@@ -156,7 +147,6 @@ data:
       public: ${CEPH_NETWORK}
       cluster: ${CEPH_NETWORK}
     deployment:
-      storage_secrets: False
       ceph: True
       rbd_provisioner: False
       cephfs_provisioner: False
diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
index ef39003bc6..84f407ecea 100644
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -93,17 +93,12 @@ data:
       public: ${CEPH_NETWORK}
       cluster: ${CEPH_NETWORK}
     deployment:
-      storage_secrets: false
       ceph: false
       rbd_provisioner: false
       cephfs_provisioner: false
       client_secrets: true
-      rgw_keystone_user_and_endpoints: false
     bootstrap:
       enabled: false
-    conf:
-      rgw_ks:
-        enabled: true
   source:
     type: local
     location: ${OSH_INFRA_PATH}
@@ -434,7 +429,6 @@ data:
       public: ${CEPH_NETWORK}
       cluster: ${CEPH_NETWORK}
     deployment:
-      storage_secrets: False
       ceph: True
       rbd_provisioner: False
       cephfs_provisioner: False
diff --git a/tools/deployment/developer/ceph/040-ceph.sh b/tools/deployment/developer/ceph/040-ceph.sh
index f03ed82994..e24d1dacfe 100755
--- a/tools/deployment/developer/ceph/040-ceph.sh
+++ b/tools/deployment/developer/ceph/040-ceph.sh
@@ -38,26 +38,10 @@ else
 fi
 tee /tmp/ceph.yaml <<EOF
 endpoints:
-  identity:
-    namespace: openstack
-  object_store:
-    namespace: ceph
-    port:
-      api:
-        default: 8088
-        public: 80
   ceph_mon:
     namespace: ceph
-    port:
-      mon:
-        default: 6789
   ceph_mgr:
     namespace: ceph
-    port:
-      mgr:
-        default: 7000
-      metrics:
-        default: 9283
 network:
   public: 172.17.0.1/16
   cluster: 172.17.0.1/16
@@ -71,12 +55,9 @@ deployment:
   rbd_provisioner: true
   cephfs_provisioner: true
   client_secrets: false
-  rgw_keystone_user_and_endpoints: false
 bootstrap:
   enabled: true
 conf:
-  rgw_ks:
-    enabled: true
   ceph:
     global:
       fsid: ${CEPH_FS_ID}
@@ -181,7 +162,6 @@ pod:
   replicas:
     mds: 1
     mgr: 1
-    rgw: 1
 
 manifests:
   cronjob_checkPGs: true
diff --git a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
index 7f7f2a172a..8fdfed70f0 100755
--- a/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
+++ b/tools/deployment/developer/ceph/045-ceph-ns-activate.sh
@@ -24,27 +24,18 @@ make -C ${OSH_INFRA_PATH} ceph-provisioners
 : ${OSH_EXTRA_HELM_ARGS:=""}
 tee /tmp/ceph-openstack-config.yaml <<EOF
 endpoints:
-  identity:
-    namespace: openstack
-  object_store:
-    namespace: ceph
   ceph_mon:
     namespace: ceph
 network:
   public: 172.17.0.1/16
   cluster: 172.17.0.1/16
 deployment:
-  storage_secrets: false
   ceph: false
   rbd_provisioner: false
   cephfs_provisioner: false
   client_secrets: true
-  rgw_keystone_user_and_endpoints: false
 bootstrap:
   enabled: false
-conf:
-  rgw_ks:
-    enabled: true
 EOF
 helm upgrade --install ceph-openstack-config ${OSH_INFRA_PATH}/ceph-provisioners \
   --namespace=openstack \
diff --git a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
index 9573eb67c1..5bc8779f68 100755
--- a/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
+++ b/tools/deployment/developer/ceph/110-ceph-radosgateway.sh
@@ -34,11 +34,7 @@ network:
   public: 172.17.0.1/16
   cluster: 172.17.0.1/16
 deployment:
-  storage_secrets: false
   ceph: true
-  rbd_provisioner: false
-  cephfs_provisioner: false
-  client_secrets: false
   rgw_keystone_user_and_endpoints: true
 bootstrap:
   enabled: false
diff --git a/tools/deployment/multinode/030-ceph.sh b/tools/deployment/multinode/030-ceph.sh
index 809e1a9adb..f4419676e6 100755
--- a/tools/deployment/multinode/030-ceph.sh
+++ b/tools/deployment/multinode/030-ceph.sh
@@ -35,10 +35,6 @@ if [ "x${ID}" == "xcentos" ]; then
 fi
 tee /tmp/ceph.yaml << EOF
 endpoints:
-  identity:
-    namespace: openstack
-  object_store:
-    namespace: ceph
   ceph_mon:
     namespace: ceph
 network:
@@ -50,15 +46,12 @@ deployment:
   rbd_provisioner: true
   cephfs_provisioner: true
   client_secrets: false
-  rgw_keystone_user_and_endpoints: false
 bootstrap:
   enabled: true
 conf:
   ceph:
     global:
       fsid: ${CEPH_FS_ID}
-  rgw_ks:
-    enabled: true
   pool:
     crush:
       tunables: ${CRUSH_TUNABLES}
diff --git a/tools/deployment/multinode/040-ceph-ns-activate.sh b/tools/deployment/multinode/040-ceph-ns-activate.sh
index 6e80a60149..f2a571449a 100755
--- a/tools/deployment/multinode/040-ceph-ns-activate.sh
+++ b/tools/deployment/multinode/040-ceph-ns-activate.sh
@@ -21,27 +21,18 @@ CEPH_PUBLIC_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
 CEPH_CLUSTER_NETWORK="$(./tools/deployment/multinode/kube-node-subnet.sh)"
 tee /tmp/ceph-openstack-config.yaml <<EOF
 endpoints:
-  identity:
-    namespace: openstack
-  object_store:
-    namespace: ceph
   ceph_mon:
     namespace: ceph
 network:
   public: ${CEPH_PUBLIC_NETWORK}
   cluster: ${CEPH_CLUSTER_NETWORK}
 deployment:
-  storage_secrets: false
   ceph: false
   rbd_provisioner: false
   cephfs_provisioner: false
   client_secrets: true
-  rgw_keystone_user_and_endpoints: false
 bootstrap:
   enabled: false
-conf:
-  rgw_ks:
-    enabled: true
 EOF
 
 : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
diff --git a/tools/deployment/multinode/090-ceph-radosgateway.sh b/tools/deployment/multinode/090-ceph-radosgateway.sh
index 014231f6f5..d2001c63a8 100755
--- a/tools/deployment/multinode/090-ceph-radosgateway.sh
+++ b/tools/deployment/multinode/090-ceph-radosgateway.sh
@@ -31,11 +31,7 @@ network:
   public: ${CEPH_PUBLIC_NETWORK}
   cluster: ${CEPH_CLUSTER_NETWORK}
 deployment:
-  storage_secrets: false
   ceph: true
-  rbd_provisioner: false
-  cephfs_provisioner: false
-  client_secrets: false
   rgw_keystone_user_and_endpoints: true
 bootstrap:
   enabled: false