diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index 30deccb..9e42255 100644
--- a/omec/omec-control-plane/Chart.yaml
+++ b/omec/omec-control-plane/Chart.yaml
@@ -10,4 +10,4 @@
 name: omec-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.2.3
+version: 0.2.4
diff --git a/omec/omec-control-plane/templates/job-hss-bootstrap.yaml b/omec/omec-control-plane/templates/job-hss-bootstrap.yaml
index 3feee66..3855495 100644
--- a/omec/omec-control-plane/templates/job-hss-bootstrap.yaml
+++ b/omec/omec-control-plane/templates/job-hss-bootstrap.yaml
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 */}}
 
+{{- if .Values.config.hss.deploy }}
 {{- if .Values.config.hss.bootstrap }}
 ---
 apiVersion: batch/v1
@@ -62,3 +63,4 @@
           name: hss
           defaultMode: 493
 {{- end }}
+{{- end }}
diff --git a/omec/omec-control-plane/templates/job-hss-db-sync.yaml b/omec/omec-control-plane/templates/job-hss-db-sync.yaml
index 8f1ede6..b1396b0 100644
--- a/omec/omec-control-plane/templates/job-hss-db-sync.yaml
+++ b/omec/omec-control-plane/templates/job-hss-db-sync.yaml
@@ -1,11 +1,10 @@
-
-
 {{/*
 # Copyright 2019-present Open Networking Foundation
 
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 */}}
 
+{{- if .Values.config.hss.deploy }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -57,3 +56,4 @@
           command: ["bash", "-xc"]
           args:
             - until cqlsh --file /opt/c3po/hssdb/oai_db.cql {{ .Values.config.hss.hssdb }}; do echo "Provisioning HSSDB"; sleep 2;done
+{{- end }}
diff --git a/omec/omec-control-plane/templates/statefulset-spgwc.yaml b/omec/omec-control-plane/templates/statefulset-spgwc.yaml
index 885d873..64f28ca 100644
--- a/omec/omec-control-plane/templates/statefulset-spgwc.yaml
+++ b/omec/omec-control-plane/templates/statefulset-spgwc.yaml
@@ -30,6 +30,7 @@
     {{- end }}
       serviceAccountName: spgwc
       initContainers:
+    {{- if .Values.config.mme.deploy }}
       - name: spgwc-dep-check
         image: {{ .Values.images.tags.depCheck | quote }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
@@ -54,6 +55,7 @@
             value: "echo done"
           - name: DEPENDENCY_POD_JSON
             value: '[{"labels": {"app": "mme"}, "requireSameNode": false}]'
+    {{- end }}
     {{- if .Values.config.coreDump.enabled }}
 {{ tuple "spgwc" . | include "omec-control-plane.coredump_init" | indent 6 }}
     {{- end }}