diff --git a/comac-in-a-box/Makefile b/comac-in-a-box/Makefile
index aa5faf6..79a101e 100644
--- a/comac-in-a-box/Makefile
+++ b/comac-in-a-box/Makefile
@@ -11,7 +11,7 @@
 KUBESPRAY_VERSION ?= release-2.11
 DOCKER_VERSION	?= 18.09
 K8S_VERSION	?= v1.15.3
-HELM_VERSION	?= v2.15.0
+HELM_VERSION	?= v2.16.1
 
 # used to start logging/monitoring and other infrastructure charts
 INFRA_CHARTS	?=
@@ -89,7 +89,6 @@
 		-e "{'docker_iptables_enabled' : True}" \
 		-e "{'kube_version' : $(K8S_VERSION)}" \
 		-e "{'kube_network_plugin_multus' : True, 'multus_version' : stable}" \
-		-e "{'kube_proxy_mode': iptables}" \
 		-e "{'kube_proxy_metrics_bind_address' : 0.0.0.0:10249}" \
 		-e "{'kube_pods_subnet' : 192.168.0.0/17, 'kube_service_addresses' : 192.168.128.0/17}" \
 		-e "{'kube_apiserver_node_port_range' : 2000-36767}" \
@@ -122,10 +121,10 @@
 $(M)/platform: | $(M)/helm-ready $(WORKSPACE)/cord/helm-charts $(WORKSPACE)/cord/cord-platform
 	cd $(WORKSPACE)/cord/cord-platform && \
 	helm dep update cord-platform && \
-	helm install $(HELM_GLOBAL_ARGS) --name cord-platform cord-platform -f $(CIABVALUES)
+	helm upgrade --install $(HELM_GLOBAL_ARGS) cord-platform cord-platform -f $(CIABVALUES)
 	cd $(WORKSPACE)/cord/helm-charts && \
 	helm dep update comac && \
-	helm install $(HELM_GLOBAL_ARGS) --name comac comac -f $(CIABVALUES)
+	helm upgrade --install $(HELM_GLOBAL_ARGS) comac comac -f $(CIABVALUES)
 	touch $@
 
 /opt/cni/bin/simpleovs: | $(M)/k8s-ready
@@ -154,8 +153,8 @@
 	cd $(WORKSPACE)/cord/helm-charts/omec; \
 	helm dep up omec-data-plane && \
 	helm dep up omec-control-plane && \
-	helm install $(HELM_GLOBAL_ARGS) --namespace omec --name omec-data-plane omec-data-plane -f $(CIABVALUES) && \
-	helm install $(HELM_GLOBAL_ARGS) --namespace omec --name omec-control-plane omec-control-plane -f $(CIABVALUES)
+	helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec omec-data-plane omec-data-plane -f $(CIABVALUES) && \
+	helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec omec-control-plane omec-control-plane -f $(CIABVALUES)
 	$(WORKSPACE)/cord/helm-charts/scripts/wait_for_pods.sh omec
 	touch $@
 
@@ -177,7 +176,7 @@
 	sudo ip addr add 127.0.0.2/8 dev lo || true
 	$(eval mme_iface=$(shell ip -4 route list default | awk -F 'dev' '{ print $$2; exit }' | awk '{ print $$1 }'))
 	cd $(WORKSPACE)/cord/helm-charts; \
-	helm install $(HELM_GLOBAL_ARGS) --namespace omec --name oaisim oaisim -f $(CIABVALUES) \
+	helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec oaisim oaisim -f $(CIABVALUES) \
 		--set config.enb.networks.s1_mme.interface=$(mme_iface)
 	$(WORKSPACE)/cord/helm-charts/scripts/wait_for_pods.sh omec
 	@timeout 60s bash -c \
diff --git a/comac/kubespray/extra-vars.yaml b/comac/kubespray/extra-vars.yaml
index 034ca39..e05a6d2 100644
--- a/comac/kubespray/extra-vars.yaml
+++ b/comac/kubespray/extra-vars.yaml
@@ -53,4 +53,4 @@
 
 helm_enabled: true
 helm_deployment_type: host
-helm_version: v2.15.0
+helm_version: v2.16.1
diff --git a/comac/override-values/override-values-multi.yaml b/comac/override-values/override-values-multi.yaml
index c4acd8f..de2c96e 100644
--- a/comac/override-values/override-values-multi.yaml
+++ b/comac/override-values/override-values-multi.yaml
@@ -50,11 +50,13 @@
           apn: apn1
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
         - imsi: "732111000000421"
           msisdn: "1122334455"
           apn: apn1
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
       mmes:
         - id: 1
           isdn: "19136246000"
@@ -75,331 +77,6 @@
     dpComm:
       addr: 10.90.0.131
       port: 30020
-    cfgFiles:
-      adc_rules.cfg: |
-        [GLOBAL]
-        NUM_ADC_RULES = 5
-
-        [ADC_RULE_1]
-        ADC_TYPE = 1
-        IP = 13.1.1.111
-
-        [ADC_RULE_2]
-        ADC_TYPE = 2
-        IP = 13.1.1.0
-        PREFIX = 24
-
-        [ADC_RULE_3]
-        ADC_TYPE = 1
-        IP = 13.1.1.112
-        PREFIX = 24
-
-        [ADC_RULE_4]
-        ADC_TYPE = 0
-        DOMAIN = www.example.gov
-
-        [ADC_RULE_5]
-        ADC_TYPE = 0
-        DOMAIN = www.drop_example.com
-      meter_profile.cfg: |
-        [GLOBAL]
-        NUM_OF_IDX = 7
-
-        [ENTRY_1]
-        ;Committed Information Rate (CIR). Measured in bytes per second.
-        ;MBR is mapped into CIR, convert MBR from bits to Bytes and set CIR.
-        CIR = 2342400
-        ;Committed Burst Size unit = Bytes
-        CBS = 5856
-        ;Excess Burst Size unit = Bytes
-        EBS = 11712
-        ;Meter profile index. Refer this index in static_pcc.cfg to set AMBR/MBR
-        MTR_PROFILE_IDX = 3
-
-        [ENTRY_2]
-        ;1200 = 1756800
-        ;1400 = 2049600
-        ;1600 = 2342400
-        CIR = 2342400
-        CBS = 5856
-        EBS = 11712
-        MTR_PROFILE_IDX = 4
-
-        [ENTRY_3]
-        ; QCI5,QCI7 15.571kbps = 1947 B
-        CIR = 2342400
-        CBS = 5856
-        EBS = 11712
-        MTR_PROFILE_IDX = 5
-
-        [ENTRY_4]
-        ; QCI1, 44kbps = 5500 B
-        CIR = 2342400
-        CBS = 5856
-        EBS = 11712
-        MTR_PROFILE_IDX = 6
-
-        [ENTRY_5]
-        ; QCI9, 31.143kbps = 3893 B
-        CIR = 2342400
-        CBS = 5856
-        EBS = 11712
-        MTR_PROFILE_IDX = 7
-
-        [ENTRY_6]
-        ; 128B, 7pps
-        CIR = 2342400
-        CBS = 512
-        EBS = 1024
-        MTR_PROFILE_IDX = 8
-
-        [ENTRY_7]
-        ; 128B, 2pps
-        CIR = 2342400
-        CBS = 512
-        EBS = 1024
-        MTR_PROFILE_IDX = 9
-
-      pcc_rules.cfg: |
-        [GLOBAL]
-        NUM_PCC_FILTERS = 9
-        ;To config AMBR/MBR values refer meter_profile.cfg. specify only the
-        ;meter profile index to be set here.
-        UL_AMBR_MTR_PROFILE_IDX = 3
-        DL_AMBR_MTR_PROFILE_IDX = 4
-
-        ;default filter - must be first for now (until DP doesn't install any filters)
-        ;associated with default adc rule
-        [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
-        ;Specify the meter profile index from meter_profile.cfg
-        UL_MBR_MTR_PROFILE_IDX = 7
-        DL_MBR_MTR_PROFILE_IDX = 7
-        ;List of ADC filter indices
-        SDF_FILTER_IDX = 99998
-
-        [PCC_FILTER_2]
-        RULE_NAME = sdf_rule_1
-        RATING_GROUP = 5
-        SERVICE_ID = 0
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 2
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = 0
-        REDIRECT_INFO = 0
-        PRECEDENCE = 1
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 5
-        DL_MBR_MTR_PROFILE_IDX = 5
-        ;List of SDF filter indices
-        SDF_FILTER_IDX = 1
-
-        [PCC_FILTER_3]
-        RULE_NAME = sdf_rule_2
-        RATING_GROUP = 1
-        SERVICE_ID = 0
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 3
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = 0
-        REDIRECT_INFO = 0
-        PRECEDENCE = 18
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 6
-        DL_MBR_MTR_PROFILE_IDX = 6
-        ;List of SDF filter indices
-        SDF_FILTER_IDX = 2
-
-        [PCC_FILTER_4]
-        RULE_NAME = adc_rule_1
-        RATING_GROUP = Zero-Rate
-        SERVICE_ID = Internet
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 8
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        REDIRECT_INFO = 0
-        SPONSOR_ID = Example
-        PRECEDENCE = 15
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 7
-        DL_MBR_MTR_PROFILE_IDX = 7
-        ;List of SDF filter indices
-        ADC_FILTER_IDX = 1
-
-        [PCC_FILTER_5]
-        RULE_NAME = adc_rule_2
-        RATING_GROUP = 0
-        SERVICE_ID = CIPA
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 9
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = Example
-        REDIRECT_INFO = 0
-        SPONSOR_ID = Example
-        REDIRECT_INFO = 0
-        PRECEDENCE = 4
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 0
-        DL_MBR_MTR_PROFILE_IDX = 0
-        ;List of SDF filter indices
-        ADC_FILTER_IDX = 2
-
-        [PCC_FILTER_6]
-        RULE_NAME = sdf_rule_3
-        RATING_GROUP = 7
-        SERVICE_ID = 0
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 4
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = 0
-        REDIRECT_INFO = 0
-        PRECEDENCE = 17
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 5
-        DL_MBR_MTR_PROFILE_IDX = 5
-        ;List of SDF filter indices
-        SDF_FILTER_IDX = 3
-
-        [PCC_FILTER_7]
-        RULE_NAME = adc_rule_3
-        RATING_GROUP = Zero-Rate
-        SERVICE_ID = Internet
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 5
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = Example
-        REDIRECT_INFO = 0
-        PRECEDENCE = 210
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 7
-        DL_MBR_MTR_PROFILE_IDX = 7
-        ;List of SDF filter indices
-        ADC_FILTER_IDX = 4
-
-        [PCC_FILTER_8]
-        RULE_NAME = adc_rule_4
-        RATING_GROUP = Zero-Rate
-        SERVICE_ID = Management
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 6
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = Example
-        REDIRECT_INFO = 0
-        PRECEDENCE = 200
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 7
-        DL_MBR_MTR_PROFILE_IDX = 7
-        ;List of SDF filter indices
-        ADC_FILTER_IDX = 12
-
-        [PCC_FILTER_9]
-        RULE_NAME = adc_rule_5
-        RATING_GROUP = Zero-Rate
-        SERVICE_ID = Provisioning
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 7
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = Example
-        REDIRECT_INFO = 0
-        PRECEDENCE = 220
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 7
-        DL_MBR_MTR_PROFILE_IDX = 7
-        ;List of SDF filter indices
-        ADC_FILTER_IDX = 3
-      sdf_rules.cfg: |
-        [GLOBAL]
-        NUM_SDF_FILTERS = 4
-
-        [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
-
-        [SDF_FILTER_2]
-        DIRECTION = uplink_only
-        IPV4_LOCAL = 16.255.255.0
-        IPV4_LOCAL_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
-
-        [SDF_FILTER_3]
-        DIRECTION = downlink_only
-        IPV4_REMOTE = 130.10.0.0
-        IPV4_REMOTE_MASK = 255.255.0.0
-        PROTOCOL = 17
-        REMOTE_LOW_LIMIT_PORT = 5060
-        REMOTE_HIGH_LIMIT_PORT = 5060
-
-        [SDF_FILTER_4]
-        DIRECTION = uplink_only
-        IPV4_REMOTE = 103.1.0.0
-        IPV4_REMOTE_MASK = 255.255.0.0
-        PROTOCOL = 17
-        LOCAL_LOW_LIMIT_PORT = 17000
-        LOCAL_HIGH_LIMIT_PORT = 17010
 # CDN configuration values
   cdnRemotes:
   - name: remote-1
diff --git a/comac/override-values/override-values-single.yaml b/comac/override-values/override-values-single.yaml
index bcae6a4..5e3d1c6 100644
--- a/comac/override-values/override-values-single.yaml
+++ b/comac/override-values/override-values-single.yaml
@@ -51,341 +51,17 @@
           apn: apn1
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
         - imsi: "732111000000421"
           msisdn: "1122334455"
           apn: apn1
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
       mmes:
         - id: 1
           isdn: "19136246000"
           unreachability: 1
-  spgwc:
-    cfgFiles:
-      adc_rules.cfg: |
-        [GLOBAL]
-        NUM_ADC_RULES = 5
-
-        [ADC_RULE_1]
-        ADC_TYPE = 1
-        IP = 13.1.1.111
-
-        [ADC_RULE_2]
-        ADC_TYPE = 2
-        IP = 13.1.1.0
-        PREFIX = 24
-
-        [ADC_RULE_3]
-        ADC_TYPE = 1
-        IP = 13.1.1.112
-        PREFIX = 24
-
-        [ADC_RULE_4]
-        ADC_TYPE = 0
-        DOMAIN = www.example.gov
-
-        [ADC_RULE_5]
-        ADC_TYPE = 0
-        DOMAIN = www.drop_example.com
-
-      meter_profile.cfg: |
-        [GLOBAL]
-        NUM_OF_IDX = 7
-
-        [ENTRY_1]
-        ;Committed Information Rate (CIR). Measured in bytes per second.
-        ;MBR is mapped into CIR, convert MBR from bits to Bytes and set CIR.
-        CIR = 2342400
-        ;Committed Burst Size unit = Bytes
-        CBS = 5856
-        ;Excess Burst Size unit = Bytes
-        EBS = 11712
-        ;Meter profile index. Refer this index in static_pcc.cfg to set AMBR/MBR
-        MTR_PROFILE_IDX = 3
-
-        [ENTRY_2]
-        ;1200 = 1756800
-        ;1400 = 2049600
-        ;1600 = 2342400
-        CIR = 2342400
-        CBS = 5856
-        EBS = 11712
-        MTR_PROFILE_IDX = 4
-
-        [ENTRY_3]
-        ; QCI5,QCI7 15.571kbps = 1947 B
-        CIR = 2342400
-        CBS = 5856
-        EBS = 11712
-        MTR_PROFILE_IDX = 5
-
-        [ENTRY_4]
-        ; QCI1, 44kbps = 5500 B
-        CIR = 2342400
-        CBS = 5856
-        EBS = 11712
-        MTR_PROFILE_IDX = 6
-
-        [ENTRY_5]
-        ; QCI9, 31.143kbps = 3893 B
-        CIR = 2342400
-        CBS = 5856
-        EBS = 11712
-        MTR_PROFILE_IDX = 7
-
-        [ENTRY_6]
-        ; 128B, 7pps
-        CIR = 2342400
-        CBS = 512
-        EBS = 1024
-        MTR_PROFILE_IDX = 8
-
-        [ENTRY_7]
-        ; 128B, 2pps
-        CIR = 2342400
-        CBS = 512
-        EBS = 1024
-        MTR_PROFILE_IDX = 9
-      pcc_rules.cfg: |
-        [GLOBAL]
-        NUM_PCC_FILTERS = 9
-        ;To config AMBR/MBR values refer meter_profile.cfg. specify only the
-        ;meter profile index to be set here.
-        UL_AMBR_MTR_PROFILE_IDX = 3
-        DL_AMBR_MTR_PROFILE_IDX = 4
-
-        ;default filter - must be first for now (until DP doesn't install any filters)
-        ;associated with default adc rule
-        [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
-        ;Specify the meter profile index from meter_profile.cfg
-        UL_MBR_MTR_PROFILE_IDX = 7
-        DL_MBR_MTR_PROFILE_IDX = 7
-        ;List of ADC filter indices
-        SDF_FILTER_IDX = 99998
-
-        [PCC_FILTER_2]
-        RULE_NAME = sdf_rule_1
-        RATING_GROUP = 5
-        SERVICE_ID = 0
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 2
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = 0
-        REDIRECT_INFO = 0
-        PRECEDENCE = 1
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 5
-        DL_MBR_MTR_PROFILE_IDX = 5
-        ;List of SDF filter indices
-        SDF_FILTER_IDX = 1
-
-        [PCC_FILTER_3]
-        RULE_NAME = sdf_rule_2
-        RATING_GROUP = 1
-        SERVICE_ID = 0
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 3
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = 0
-        REDIRECT_INFO = 0
-        PRECEDENCE = 18
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 6
-        DL_MBR_MTR_PROFILE_IDX = 6
-        ;List of SDF filter indices
-        SDF_FILTER_IDX = 2
-
-        [PCC_FILTER_4]
-        RULE_NAME = adc_rule_1
-        RATING_GROUP = Zero-Rate
-        SERVICE_ID = Internet
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 8
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        REDIRECT_INFO = 0
-        SPONSOR_ID = Example
-        PRECEDENCE = 15
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 7
-        DL_MBR_MTR_PROFILE_IDX = 7
-        ;List of SDF filter indices
-        ADC_FILTER_IDX = 1
-
-        [PCC_FILTER_5]
-        RULE_NAME = adc_rule_2
-        RATING_GROUP = 0
-        SERVICE_ID = CIPA
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 9
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = Example
-        REDIRECT_INFO = 0
-        SPONSOR_ID = Example
-        REDIRECT_INFO = 0
-        PRECEDENCE = 4
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 0
-        DL_MBR_MTR_PROFILE_IDX = 0
-        ;List of SDF filter indices
-        ADC_FILTER_IDX = 2
-
-        [PCC_FILTER_6]
-        RULE_NAME = sdf_rule_3
-        RATING_GROUP = 7
-        SERVICE_ID = 0
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 4
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = 0
-        REDIRECT_INFO = 0
-        PRECEDENCE = 17
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 5
-        DL_MBR_MTR_PROFILE_IDX = 5
-        ;List of SDF filter indices
-        SDF_FILTER_IDX = 3
-
-        [PCC_FILTER_7]
-        RULE_NAME = adc_rule_3
-        RATING_GROUP = Zero-Rate
-        SERVICE_ID = Internet
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 5
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = Example
-        REDIRECT_INFO = 0
-        PRECEDENCE = 210
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 7
-        DL_MBR_MTR_PROFILE_IDX = 7
-        ;List of SDF filter indices
-        ADC_FILTER_IDX = 4
-
-        [PCC_FILTER_8]
-        RULE_NAME = adc_rule_4
-        RATING_GROUP = Zero-Rate
-        SERVICE_ID = Management
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 6
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = Example
-        REDIRECT_INFO = 0
-        PRECEDENCE = 200
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 7
-        DL_MBR_MTR_PROFILE_IDX = 7
-        ;List of SDF filter indices
-        ADC_FILTER_IDX = 12
-
-        [PCC_FILTER_9]
-        RULE_NAME = adc_rule_5
-        RATING_GROUP = Zero-Rate
-        SERVICE_ID = Provisioning
-        RULE_STATUS = 0
-        GATE_STATUS = 1
-        SESSION_CONT = 0
-        REPORT_LEVEL = 7
-        CHARGING_MODE = 0
-        METERING_METHOD = 0
-        MUTE_NOTIFY = 0
-        MONITORING_KEY = 0
-        SPONSOR_ID = Example
-        REDIRECT_INFO = 0
-        PRECEDENCE = 220
-        DROP_PKT_COUNT = 0
-        UL_MBR_MTR_PROFILE_IDX = 7
-        DL_MBR_MTR_PROFILE_IDX = 7
-        ;List of SDF filter indices
-        ADC_FILTER_IDX = 3
-      sdf_rules.cfg: |
-        [GLOBAL]
-        NUM_SDF_FILTERS = 4
-
-        [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
-
-        [SDF_FILTER_2]
-        DIRECTION = uplink_only
-        IPV4_LOCAL = 16.255.255.0
-        IPV4_LOCAL_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
-
-        [SDF_FILTER_3]
-        DIRECTION = downlink_only
-        IPV4_REMOTE = 130.10.0.0
-        IPV4_REMOTE_MASK = 255.255.0.0
-        PROTOCOL = 17
-        REMOTE_LOW_LIMIT_PORT = 5060
-        REMOTE_HIGH_LIMIT_PORT = 5060
-
-        [SDF_FILTER_4]
-        DIRECTION = uplink_only
-        IPV4_REMOTE = 103.1.0.0
-        IPV4_REMOTE_MASK = 255.255.0.0
-        PROTOCOL = 17
-        LOCAL_LOW_LIMIT_PORT = 17000
-        LOCAL_HIGH_LIMIT_PORT = 17010
 # CDN configuration values
   cdnRemotes:
   - name: remote-1