diff --git a/charts/ceph-utility/templates/configmap-bin.yaml b/charts/ceph-utility/templates/configmap-bin.yaml
index 0bcefc53..38c150f3 100644
--- a/charts/ceph-utility/templates/configmap-bin.yaml
+++ b/charts/ceph-utility/templates/configmap-bin.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_bin .Values.deployment.ceph }}
+{{- if .Values.manifests.configmap_bin  }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
diff --git a/charts/ceph-utility/templates/configmap-etc-client.yaml b/charts/ceph-utility/templates/configmap-etc-client.yaml
index 84ea4c36..917cabcf 100644
--- a/charts/ceph-utility/templates/configmap-etc-client.yaml
+++ b/charts/ceph-utility/templates/configmap-etc-client.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if or (.Values.deployment.ceph) (.Values.deployment.client_secrets) }}
+{{- if .Values.manifests.configmap_etc_client }}
 {{- $envAll := . }}
 
 ---
diff --git a/charts/ceph-utility/templates/configmap-etc-sudoers.yaml b/charts/ceph-utility/templates/configmap-etc-sudoers.yaml
index 60cf8f89..952ba6d7 100644
--- a/charts/ceph-utility/templates/configmap-etc-sudoers.yaml
+++ b/charts/ceph-utility/templates/configmap-etc-sudoers.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.ceph }}
+{{- if .Values.manifests.configmap_etc_sudoers }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
diff --git a/charts/ceph-utility/templates/deployment-utility.yaml b/charts/ceph-utility/templates/deployment-utility.yaml
index bba18058..e08d35bd 100644
--- a/charts/ceph-utility/templates/deployment-utility.yaml
+++ b/charts/ceph-utility/templates/deployment-utility.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.deployment_utility ( and .Values.deployment.ceph .Values.conf.features.utility) }}
+{{- if .Values.manifests.deployment_utility }}
 {{- $envAll := . }}
 
 {{- $serviceAccountName := printf "%s" $envAll.Release.Name }}
diff --git a/charts/ceph-utility/values.yaml b/charts/ceph-utility/values.yaml
index f1f7da41..9e7035bc 100644
--- a/charts/ceph-utility/values.yaml
+++ b/charts/ceph-utility/values.yaml
@@ -17,9 +17,6 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
-deployment:
-  ceph: true
-
 release_group: null
 
 images:
diff --git a/charts/compute-utility/templates/configmap-bin.yaml b/charts/compute-utility/templates/configmap-bin.yaml
index 5075717a..1bc239c1 100644
--- a/charts/compute-utility/templates/configmap-bin.yaml
+++ b/charts/compute-utility/templates/configmap-bin.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_bin .Values.deployment.compute }}
+{{- if .Values.manifests.configmap_bin }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
diff --git a/charts/compute-utility/templates/configmap-etc-client.yaml b/charts/compute-utility/templates/configmap-etc-client.yaml
index c9216a13..6991640f 100644
--- a/charts/compute-utility/templates/configmap-etc-client.yaml
+++ b/charts/compute-utility/templates/configmap-etc-client.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_etc_client .Values.deployment.compute }}
+{{- if .Values.manifests.configmap_etc_client }}
 {{- $envAll := . }}
 
 ---
diff --git a/charts/compute-utility/templates/configmap-etc-sudoers.yaml b/charts/compute-utility/templates/configmap-etc-sudoers.yaml
index f6f3d161..2057e861 100644
--- a/charts/compute-utility/templates/configmap-etc-sudoers.yaml
+++ b/charts/compute-utility/templates/configmap-etc-sudoers.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.compute }}
+{{- if .Values.manifests.configmap_etc_sudoers }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
diff --git a/charts/compute-utility/templates/deployment-utility.yaml b/charts/compute-utility/templates/deployment-utility.yaml
index 7bd3dd0a..d01ab224 100644
--- a/charts/compute-utility/templates/deployment-utility.yaml
+++ b/charts/compute-utility/templates/deployment-utility.yaml
@@ -13,7 +13,7 @@ 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.deployment_utility ( and .Values.deployment.compute .Values.conf.features.utility) }}
+{{- if .Values.manifests.deployment_utility }}
 {{- $envAll := . }}
 
 {{- $serviceAccountName := printf "%s" $envAll.Release.Name }}
diff --git a/charts/compute-utility/values.yaml b/charts/compute-utility/values.yaml
index 08b8dc5e..675bdff9 100644
--- a/charts/compute-utility/values.yaml
+++ b/charts/compute-utility/values.yaml
@@ -17,10 +17,6 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
-
-deployment:
-  compute: true
-
 release_group: null
 release_uuid: null
 
diff --git a/charts/mysqlclient-utility/templates/configmap-bin.yaml b/charts/mysqlclient-utility/templates/configmap-bin.yaml
index 639ddeaf..50a9357d 100644
--- a/charts/mysqlclient-utility/templates/configmap-bin.yaml
+++ b/charts/mysqlclient-utility/templates/configmap-bin.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_bin .Values.deployment.mysqlclient }}
+{{- if .Values.manifests.configmap_bin }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
diff --git a/charts/mysqlclient-utility/templates/configmap-etc-client.yaml b/charts/mysqlclient-utility/templates/configmap-etc-client.yaml
index c892bdd9..73693abb 100644
--- a/charts/mysqlclient-utility/templates/configmap-etc-client.yaml
+++ b/charts/mysqlclient-utility/templates/configmap-etc-client.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_etc_client .Values.deployment.mysqlclient }}
+{{- if .Values.manifests.configmap_etc_client }}
 {{- $envAll := . }}
 
 ---
diff --git a/charts/mysqlclient-utility/templates/configmap-etc-sudoers.yaml b/charts/mysqlclient-utility/templates/configmap-etc-sudoers.yaml
index 9b6357b0..bc23a76f 100644
--- a/charts/mysqlclient-utility/templates/configmap-etc-sudoers.yaml
+++ b/charts/mysqlclient-utility/templates/configmap-etc-sudoers.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.mysqlclient }}
+{{- if .Values.manifests.configmap_etc_sudoers  }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
diff --git a/charts/mysqlclient-utility/templates/deployment-utility.yaml b/charts/mysqlclient-utility/templates/deployment-utility.yaml
index ce5ddd0c..833bda68 100644
--- a/charts/mysqlclient-utility/templates/deployment-utility.yaml
+++ b/charts/mysqlclient-utility/templates/deployment-utility.yaml
@@ -13,7 +13,7 @@ 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.deployment_utility ( and .Values.deployment.mysqlclient .Values.conf.features.utility) }}
+{{- if .Values.manifests.deployment_utility }}
 {{- $envAll := . }}
 
 {{- $serviceAccountName := printf "%s" $envAll.Release.Name }}
diff --git a/charts/mysqlclient-utility/values.yaml b/charts/mysqlclient-utility/values.yaml
index 31d10fe3..8d431c04 100644
--- a/charts/mysqlclient-utility/values.yaml
+++ b/charts/mysqlclient-utility/values.yaml
@@ -17,9 +17,6 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
-deployment:
-  mysqlclient: true
-
 release_group: null
 
 images:
diff --git a/charts/openstack-utility/templates/configmap-bin.yaml b/charts/openstack-utility/templates/configmap-bin.yaml
index c8685cd5..00a66066 100644
--- a/charts/openstack-utility/templates/configmap-bin.yaml
+++ b/charts/openstack-utility/templates/configmap-bin.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_bin .Values.deployment.openstack }}
+{{- if .Values.manifests.configmap_bin }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
diff --git a/charts/openstack-utility/templates/configmap-etc-client.yaml b/charts/openstack-utility/templates/configmap-etc-client.yaml
index b8af4752..9291348e 100644
--- a/charts/openstack-utility/templates/configmap-etc-client.yaml
+++ b/charts/openstack-utility/templates/configmap-etc-client.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_etc_client .Values.deployment.openstack }}
+{{- if .Values.manifests.configmap_etc_client }}
 {{- $envAll := . }}
 
 ---
diff --git a/charts/openstack-utility/templates/configmap-etc-sudoers.yaml b/charts/openstack-utility/templates/configmap-etc-sudoers.yaml
index e23f046f..2057e861 100644
--- a/charts/openstack-utility/templates/configmap-etc-sudoers.yaml
+++ b/charts/openstack-utility/templates/configmap-etc-sudoers.yaml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.openstack }}
+{{- if .Values.manifests.configmap_etc_sudoers }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
diff --git a/charts/openstack-utility/templates/deployment-utility.yaml b/charts/openstack-utility/templates/deployment-utility.yaml
index e39feba6..0fe910f5 100644
--- a/charts/openstack-utility/templates/deployment-utility.yaml
+++ b/charts/openstack-utility/templates/deployment-utility.yaml
@@ -13,7 +13,7 @@ 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.deployment_utility ( and .Values.deployment.openstack) }}
+{{- if .Values.manifests.deployment_utility }}
 {{- $envAll := . }}
 
 {{- $serviceAccountName := printf "%s" $envAll.Release.Name }}
diff --git a/charts/openstack-utility/values.yaml b/charts/openstack-utility/values.yaml
index 1a066c78..46bf8388 100644
--- a/charts/openstack-utility/values.yaml
+++ b/charts/openstack-utility/values.yaml
@@ -4,9 +4,6 @@
 # name: value
 
 
-deployment:
-  openstack: true
-
 release_group: null
 
 images:
diff --git a/charts/postgresql-utility/templates/configmap-bin.yaml b/charts/postgresql-utility/templates/configmap-bin.yaml
index 08bf99e0..5fcfcb53 100644
--- a/charts/postgresql-utility/templates/configmap-bin.yaml
+++ b/charts/postgresql-utility/templates/configmap-bin.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.manifests.configmap_bin .Values.deployment.postgresql }}
+{{- if .Values.manifests.configmap_bin }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
@@ -25,4 +25,4 @@ data:
   utilscli: |
 {{ tuple "bin/utility/_utilscli.tpl" . | include  "helm-toolkit.utils.template" | indent 4 }}
 
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/postgresql-utility/templates/configmap-etc-client.yaml b/charts/postgresql-utility/templates/configmap-etc-client.yaml
index 5ef0c801..77ac6810 100644
--- a/charts/postgresql-utility/templates/configmap-etc-client.yaml
+++ b/charts/postgresql-utility/templates/configmap-etc-client.yaml
@@ -1,4 +1,4 @@
-{{- if or (.Values.deployment.postgresql) (.Values.deployment.client_secrets) }}
+{{- if .Values.manifests.configmap_etc_client }}
 {{- $envAll := . }}
 
 ---
diff --git a/charts/postgresql-utility/templates/configmap-etc-sudoers.yaml b/charts/postgresql-utility/templates/configmap-etc-sudoers.yaml
index 369b4c8d..f0da23ba 100644
--- a/charts/postgresql-utility/templates/configmap-etc-sudoers.yaml
+++ b/charts/postgresql-utility/templates/configmap-etc-sudoers.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.postgresql }}
+{{- if .Values.manifests.configmap_etc_sudoers }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
diff --git a/charts/postgresql-utility/templates/deployment-utility.yaml b/charts/postgresql-utility/templates/deployment-utility.yaml
index ce1b1e09..3ee1679f 100644
--- a/charts/postgresql-utility/templates/deployment-utility.yaml
+++ b/charts/postgresql-utility/templates/deployment-utility.yaml
@@ -13,7 +13,7 @@ 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.deployment_utility ( and .Values.deployment.postgresql .Values.conf.features.utility) }}
+{{- if .Values.manifests.deployment_utility }}
 {{- $envAll := . }}
 
 {{- $serviceAccountName := printf "%s" $envAll.Release.Name }}
diff --git a/charts/postgresql-utility/values.yaml b/charts/postgresql-utility/values.yaml
index e13eb0c7..6d3509bc 100644
--- a/charts/postgresql-utility/values.yaml
+++ b/charts/postgresql-utility/values.yaml
@@ -17,9 +17,6 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-deployment:
-  postgresql: true
-
 release_group: null
 
 images: