diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index 5d89bd3..c3d3748 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.6.17
+version: 0.6.18
diff --git a/omec/omec-control-plane/values.yaml b/omec/omec-control-plane/values.yaml
index 74e2aa6..0136a0b 100644
--- a/omec/omec-control-plane/values.yaml
+++ b/omec/omec-control-plane/values.yaml
@@ -7,14 +7,14 @@
 images:
   tags:
     init: docker.io/omecproject/pod-init:1.0.0
-    hssdb: "registry.aetherproject.org/proxy/omecproject/c3po-hssdb:master-deaea91"
-    hss: "registry.aetherproject.org/proxy/omecproject/c3po-hss:master-deaea91"
+    hssdb: "registry.aetherproject.org/proxy/omecproject/c3po-hssdb:master-22ccd06"
+    hss: "registry.aetherproject.org/proxy/omecproject/c3po-hss:master-22ccd06"
     mme: "registry.aetherproject.org/proxy/omecproject/nucleus:master-9f86f87"
-    spgwc: "registry.aetherproject.org/omecproject/spgw:master-b9ce120"
+    spgwc: "registry.aetherproject.org/omecproject/spgw:master-d8b0987"
     pcrf: "registry.aetherproject.org/proxy/omecproject/c3po-pcrf:pcrf-7824e6e"
     pcrfdb: "registry.aetherproject.org/proxy/omecproject/c3po-pcrfdb:pcrf-7824e6e"
     depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-    config4g: "registry.aetherproject.org/omecproject/5gc-webui:onf-release3.0.5-latest"
+    config4g: "registry.aetherproject.org/omecproject/5gc-webui:onf-release3.0.5-c22caf8"
   pullPolicy: IfNotPresent
   # Secrets must be manually created in the namespace.
   pullSecrets:
diff --git a/sdcore-helm-charts/Chart.yaml b/sdcore-helm-charts/Chart.yaml
index 23cef1b..30e81cd 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.0
+version: 0.5.1
 home: https://opennetworking.org/sd-core/
 maintainers:
   - name: SD-Core Support
@@ -16,8 +16,9 @@
 
 dependencies:
   - name: omec-control-plane
-    version: 0.6.16
+    version: 0.6.17
     repository: https://charts.aetherproject.org
+    condition: omec-control-plane.enable4G
 
   - name: omec-sub-provision
     version: 0.0.3
@@ -25,8 +26,9 @@
     condition: simapp.deploy
 
   - name: 5g-control-plane
-    version: 0.2.17
+    version: 0.2.18
     repository: https://charts.aetherproject.org
+    condition: 5g-control-plane.enable5G
 
   - name: omec-user-plane
     version: 0.3.25
diff --git a/sdcore-helm-charts/values.yaml b/sdcore-helm-charts/values.yaml
index bd6b298..500fdf4 100644
--- a/sdcore-helm-charts/values.yaml
+++ b/sdcore-helm-charts/values.yaml
@@ -11,12 +11,13 @@
   tags:
     #4G control Plane images
     init: docker.io/omecproject/pod-init:1.0.0
-    hssdb: registry.aetherproject.org/proxy/omecproject/c3po-hssdb:master-deaea91
-    hss: registry.aetherproject.org/proxy/omecproject/c3po-hss:master-deaea91
+    hssdb: registry.aetherproject.org/proxy/omecproject/c3po-hssdb:master-22ccd06
+    hss: registry.aetherproject.org/proxy/omecproject/c3po-hss:master-22ccd06
     mme: registry.aetherproject.org/proxy/omecproject/nucleus:master-9f86f87
-    spgwc: registry.aetherproject.org/omecproject/spgw:master-a3dc7d9
+    spgwc: registry.aetherproject.org/omecproject/spgw:master-d8b0987
     pcrf: registry.aetherproject.org/proxy/omecproject/c3po-pcrf:pcrf-7824e6e
     pcrfdb: registry.aetherproject.org/proxy/omecproject/c3po-pcrfdb:pcrf-7824e6e
+    config4g: registry.aetherproject.org/omecproject/5gc-webui:onf-release3.0.5-c22caf8
     depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
 
     #4G/5G user plane images
@@ -36,7 +37,13 @@
     udr: registry.aetherproject.org/proxy/omecproject/5gc-udr:onf-release3.0.5-e295a76
     udm: registry.aetherproject.org/proxy/omecproject/5gc-udm:onf-release3.0.5-ea3ef93
 
+omec-control-plane:
+  enable4G: false
+5g-control-plane:
+  enable5G: true
 config:
+  config4g:
+    deploy: true
   upf:
     cfgFiles:
       upf.json: