diff --git a/omec-control-plane/Chart.yaml b/omec-control-plane/Chart.yaml
index 2c1ed62..de01e0d 100644
--- a/omec-control-plane/Chart.yaml
+++ b/omec-control-plane/Chart.yaml
@@ -10,4 +10,4 @@
 name: omec-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.9.14
+version: 0.9.15
diff --git a/omec-control-plane/templates/bin/_mme-run.sh.tpl b/omec-control-plane/templates/bin/_mme-run.sh.tpl
index c739aa6..1712a77 100644
--- a/omec-control-plane/templates/bin/_mme-run.sh.tpl
+++ b/omec-control-plane/templates/bin/_mme-run.sh.tpl
@@ -27,7 +27,11 @@
       echo "Starting s1ap-app"
       echo "conf/s1ap.json"
       cat conf/s1ap.json
+      {{- if .Values.config.valgrind.enabled }}
+      valgrind --log-file=/bin/valgrind_output_s1ap.txt --tool=memcheck -v --leak-check=full --show-leak-kinds=all ./bin/s1ap-app
+      {{- else }}
       ./bin/s1ap-app
+      {{- end }}
       ;;
     "s6a-app")
       echo "Starting s6a-app"
diff --git a/omec-control-plane/values.yaml b/omec-control-plane/values.yaml
index f1383f4..37d0053 100644
--- a/omec-control-plane/values.yaml
+++ b/omec-control-plane/values.yaml
@@ -10,8 +10,8 @@
     depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
     hssdb: registry.aetherproject.org/proxy/omecproject/c3po-hssdb:master-771c0c3
     hss: registry.aetherproject.org/proxy/omecproject/c3po-hss:master-771c0c3
-    mme: registry.aetherproject.org/proxy/omecproject/nucleus:master-1225da6
-    spgwc: registry.aetherproject.org/omecproject/spgw:master-282dc78
+    mme: registry.aetherproject.org/proxy/omecproject/nucleus:master-ccdbf69
+    spgwc: registry.aetherproject.org/omecproject/spgw:master-144bd86
     pcrf: registry.aetherproject.org/proxy/omecproject/c3po-pcrf:pcrf-a6bdc3d
     pcrfdb: registry.aetherproject.org/proxy/omecproject/c3po-pcrfdb:pcrf-a6bdc3d
     config4g: registry.aetherproject.org/omecproject/5gc-webui:onf-release3.0.5-e29f159
@@ -104,6 +104,8 @@
 
 config:
   clusterDomain: cluster.local
+  valgrind:
+    enabled: false
   coreDump:
     enabled: true
     path: /tmp/coredump