diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index b2aaac8..91245ab 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.10
+version: 0.6.11
diff --git a/omec/omec-control-plane/templates/bin/_spgwc-run.sh.tpl b/omec/omec-control-plane/templates/bin/_spgwc-run.sh.tpl
index b7f6cb0..fd1096d 100644
--- a/omec/omec-control-plane/templates/bin/_spgwc-run.sh.tpl
+++ b/omec/omec-control-plane/templates/bin/_spgwc-run.sh.tpl
@@ -9,22 +9,18 @@
 
 mkdir -p /opt/cp/config
 cd /opt/cp/config
-cp /etc/cp/config/{*.cfg,*.json,*.conf} .
+cp /etc/cp/config/{*.json,*.conf} .
 
 case $APPLICATION in
     "ngic_controlplane")
       echo "Starting ngic controlplane app"
-      if [ ! -d "/dev/hugepages" ]; then
-          MEMORY="--no-huge -m $((MEM_LIMIT-1024))"
-      fi
-      CORES="-c $(taskset -p $$ | awk '{print $NF}')"
-      EAL_ARGS="${CORES} ${MEMORY} --no-pci"
+      cat /opt/cp/config/cp.json
       cat /opt/cp/config/subscriber_mapping.json
       {{- if .Values.config.coreDump.enabled }}
       cp /bin/ngic_controlplane /tmp/coredump/
       {{- end }}
 
-      ngic_controlplane $EAL_ARGS -- -f /etc/cp/config/
+      ngic_controlplane -f /etc/cp/config/
       ;;
 
     "gx-app")
diff --git a/omec/omec-control-plane/templates/configmap-spgwc.yaml b/omec/omec-control-plane/templates/configmap-spgwc.yaml
index 645bfff..2c3fe54 100644
--- a/omec/omec-control-plane/templates/configmap-spgwc.yaml
+++ b/omec/omec-control-plane/templates/configmap-spgwc.yaml
@@ -38,45 +38,6 @@
   labels:
 {{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 data:
-  cp.cfg: |
-    [GLOBAL]
-    CP_TYPE = 03
-    GX_CONFIG = {{ .Values.config.spgwc.global.gx_config }}
-    URR_CONFIG = {{ .Values.config.spgwc.global.urr_config }}
-    LOGGING_LEVEL = {{ .Values.config.spgwc.global.logging_level}}
-    S5S8_PORT = 2123
-    UPF_PFCP_PORT = 8805
-    S11_PORT = {{ .Values.config.spgwc.s11.port }}
-    PFCP_PORT = {{ .Values.config.spgwc.n4.port }}
-    PROMETHEUS_PORT = {{ .Values.config.spgwc.prometheus.port }}
-    HTTP_PORT = {{ .Values.config.spgwc.rest.port }}
-    TRANSMIT_TIMER = {{ .Values.config.spgwc.global.transmitTimerSec }}
-    PERIODIC_TIMER = {{ .Values.config.spgwc.global.periodicTimerSec }}
-    TRANSMIT_COUNT = {{ .Values.config.spgwc.global.transmitCount }}
-    REQUEST_TIMEOUT = {{ .Values.config.spgwc.global.requestTimeoutMilliSec }}
-    REQUEST_TRIES = {{ .Values.config.spgwc.global.requestTries }}
-    CP_LOGGER = {{ .Values.config.spgwc.global.cpLogger }}
-    [NAMESERVER_CONFIG]
-    [CACHE]
-    concurrent = {{ .Values.config.spgwc.dns.cache.concurrent }}
-    percentage = {{ .Values.config.spgwc.dns.cache.percentage }}
-    interval_seconds = {{ .Values.config.spgwc.dns.cache.intervalSec }}
-    query_timeout_ms = {{ .Values.config.spgwc.dns.cache.queryTimeoutMilliSec }}
-    query_tries = {{ .Values.config.spgwc.dns.cache.queryTries }}
-    [APP]
-    frequency_seconds = {{ .Values.config.spgwc.dns.app.frequencySec }}
-    filename = {{ .Values.config.spgwc.dns.app.filename }}
-    nameserver = {{ .Values.config.spgwc.dns.app.nameserver }}
-    [OPS]
-    frequency_seconds = {{ .Values.config.spgwc.dns.ops.frequencySec }}
-    filename = {{ .Values.config.spgwc.dns.ops.filename }}
-    nameserver = {{ .Values.config.spgwc.dns.ops.nameserver }}
-    [IP_POOL_CONFIG]
-    IP_POOL_IP= {{.Values.config.spgwc.ueIpPool.ip }}
-    IP_POOL_MASK= {{ .Values.config.spgwc.ueIpPool.mask }}
-    [STATIC_IP_POOL_CONFIG]
-    IP_POOL_IP= {{.Values.config.spgwc.staticUeIpPool.ip }}
-    IP_POOL_MASK= {{ .Values.config.spgwc.staticUeIpPool.mask }}
   gx.conf: |
     Identity = {{ tuple "spgwc" "identity" . | include "omec-control-plane.diameter_endpoint" | quote }};
     Realm = {{ tuple "spgwc" "realm" . | include "omec-control-plane.diameter_endpoint" | quote }};
diff --git a/omec/omec-control-plane/values.yaml b/omec/omec-control-plane/values.yaml
index 8096571..852e348 100644
--- a/omec/omec-control-plane/values.yaml
+++ b/omec/omec-control-plane/values.yaml
@@ -202,6 +202,7 @@
           concurrent: 10
           ossfile: conf/oss.json
           verifyroamingsubscribers: false
+          rulesfile: conf/subscriber_mapping.json
       oss.json:
         option:
           id: url
@@ -407,38 +408,6 @@
     podAnnotations:
       fluentbit.io/parser: spgwc
       field.cattle.io/workloadMetrics: '[{"path":"/metrics","port":9089,"schema":"HTTP"}]'
-    global:
-      transmitTimerSec: 2
-      periodicTimerSec: 10
-      transmitCount: 5
-      requestTimeoutMilliSec: 5000
-      requestTries: 3
-      cpLogger: 0
-      gx_config: 0
-      urr_config: 0
-      logging_level: "LOG_DEBUG"
-    #DNS Server - 3gpp compliant DNS server
-    dns:
-      cache:
-        concurrent: 25
-        percentage: 80
-        intervalSec: 60
-        queryTimeoutMilliSec: 1000
-        queryTries: 1
-      app:
-        frequencySec: 3
-        filename: "appqueries.json"
-        nameserver: "127.0.0.1"
-      ops:
-        frequencySec: 3
-        filename: "opsqueries.json"
-        nameserver: "127.0.0.1"
-    ueIpPool:
-      ip: "10.250.0.0"
-      mask: "255.255.0.0"
-    staticUeIpPool:
-      ip: "10.249.1.0"
-      mask: "255.255.255.0"
     s11:
       port: 2123
       nodePort:
@@ -470,6 +439,7 @@
           gxConfig: 0
           urrConfig: 0
           loggingLevel: "LOG_DEBUG"
+          heartbeatFailure: false
         #DNS Server - 3gpp compliant DNS server
         dns:
           cache:
@@ -565,46 +535,3 @@
           excluding-app:
             type: excluding-this-app
             filter: exclude-app-name
-    cfgFiles:
-      adc_rules.cfg: |
-        [GLOBAL]
-        NUM_ADC_RULES = 0
-      meter_profile.cfg: |
-        [GLOBAL]
-        NUM_OF_IDX = 0
-      pcc_rules.cfg: |
-        [GLOBAL]
-        NUM_PCC_FILTERS = 1
-        UL_AMBR_MTR_PROFILE_IDX = 1
-        DL_AMBR_MTR_PROFILE_IDX = 2
-        [PCC_FILTER_1]
-        RULE_NAME = DefaultRule
-        RATING_GROUP = 9
-        SERVICE_ID = 0
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 1
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = 0
-        REDIRECT_INFO = 0
-        PRECEDENCE = 254
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 3
-        DL_MBR_MTR_PROFILE_IDX = 3
-        SDF_FILTER_IDX = 99998
-      sdf_rules.cfg: |
-        [GLOBAL]
-        NUM_SDF_FILTERS = 1
-        [SDF_FILTER_1]
-        DIRECTION = downlink_only
-        IPV4_REMOTE = 13.2.1.113
-        IPV4_REMOTE_MASK = 255.255.255.0
-        PROTOCOL = 17
-        LOCAL_LOW_LIMIT_PORT = 0
-        LOCAL_HIGH_LIMIT_PORT = 65535
-        REMOTE_LOW_LIMIT_PORT = 0
-        REMOTE_HIGH_LIMIT_PORT = 65535