diff --git a/sdcore-helm-charts/Chart.yaml b/sdcore-helm-charts/Chart.yaml
index 81aaf07..13e8657 100644
--- a/sdcore-helm-charts/Chart.yaml
+++ b/sdcore-helm-charts/Chart.yaml
@@ -8,7 +8,7 @@
 description: SD-Core control plane services
 icon: https://guide.opencord.org/logos/cord.svg
 type: application
-version: 0.5.4
+version: 0.5.5
 home: https://opennetworking.org/sd-core/
 maintainers:
   - name: SD-Core Support
@@ -23,7 +23,7 @@
   - name: omec-sub-provision
     version: 0.0.3
     repository: https://charts.aetherproject.org
-    condition: simapp.deploy
+    condition: omec-sub-provision.enable
 
   - name: 5g-control-plane
     version: 0.2.18
@@ -33,4 +33,4 @@
   - name: omec-user-plane
     version: 0.3.25
     repository: https://charts.aetherproject.org
-
+    condition: omec-user-plane.enable
diff --git a/sdcore-helm-charts/values.yaml b/sdcore-helm-charts/values.yaml
index f907d87..5c8f210 100644
--- a/sdcore-helm-charts/values.yaml
+++ b/sdcore-helm-charts/values.yaml
@@ -26,6 +26,7 @@
       deploy: true
 
 omec-user-plane:
+  enable: true
   images:
     tags:
       #4G/5G user plane images
@@ -40,6 +41,7 @@
             hostname: "upf"
 
 omec-sub-provision:
+  enable: true
   images:
     tags:
       simapp: registry.aetherproject.org/omecproject/simapp:main-aa6dae9