diff --git a/ceph-client/templates/configmap-etc-client.yaml b/ceph-client/templates/configmap-etc-client.yaml
index 7464532a3..3c459b00c 100644
--- a/ceph-client/templates/configmap-etc-client.yaml
+++ b/ceph-client/templates/configmap-etc-client.yaml
@@ -19,7 +19,7 @@ limitations under the License.
 {{- $envAll := index . 1 }}
 {{- with $envAll }}
 
-{{- if or (.Values.deployment.ceph) (.Values.deployment.client_secrets) }}
+{{- if .Values.deployment.ceph }}
 
 {{- if empty .Values.conf.ceph.global.mon_host -}}
 {{- $monHost := tuple "ceph_mon" "internal" "mon" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index 3319895be..1473e08c2 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -42,9 +42,6 @@ labels:
   job:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
-  provisioner:
-    node_selector_key: openstack-control-plane
-    node_selector_value: enabled
   mds:
     node_selector_key: ceph-mds
     node_selector_value: enabled