diff --git a/omec/5g-control-plane/Chart.yaml b/omec/5g-control-plane/Chart.yaml
index 89bd019..3250b24 100644
--- a/omec/5g-control-plane/Chart.yaml
+++ b/omec/5g-control-plane/Chart.yaml
@@ -8,7 +8,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.2.2
+version: 0.2.3
 
 dependencies:
   - name: mongodb
diff --git a/omec/5g-control-plane/templates/bin/_amf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_amf-run.sh.tpl
index 4a2f3f6..6cb6dd7 100644
--- a/omec/5g-control-plane/templates/bin/_amf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_amf-run.sh.tpl
@@ -12,7 +12,6 @@
 
 cd /free5gc
 cp /tmp/config/* config/
-sed -i "s/POD_IP/${POD_IP}/g" config/amfcfg.conf
 
 cat config/free5GC.conf
 cat config/amfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
index f97bd8e..820b6cb 100644
--- a/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_ausf-run.sh.tpl
@@ -12,9 +12,8 @@
 
 cd /free5gc
 cp /tmp/config/* config/
-sed -i "s/POD_IP/${POD_IP}/g" config/ausfcfg.conf
 
 cat config/free5GC.conf
 cat config/ausfcfg.conf
 
-./ausf/ausf -ausfcfg config/ausfcfg.conf
\ No newline at end of file
+./ausf/ausf -ausfcfg config/ausfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
index 873df5c..57f6613 100644
--- a/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_nssf-run.sh.tpl
@@ -12,7 +12,6 @@
 
 cd /free5gc
 cp /tmp/config/* config/
-sed -i "s/POD_IP/${POD_IP}/g" config/nssfcfg.conf
 
 cat config/free5GC.conf
 cat config/nssfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl b/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
index b47eb21..a758c44 100644
--- a/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_pcf-run.sh.tpl
@@ -12,7 +12,6 @@
 
 cd /free5gc
 cp /tmp/config/* config/
-sed -i "s/POD_IP/${POD_IP}/g" config/pcfcfg.conf
 
 cat config/free5GC.conf
 cat config/pcfcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl b/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
index 9ad07f5..382cae4 100644
--- a/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_udm-run.sh.tpl
@@ -12,7 +12,6 @@
 
 cd /free5gc
 cp /tmp/config/* config/
-sed -i "s/POD_IP/${POD_IP}/g" config/udmcfg.conf
 
 cat config/free5GC.conf
 cat config/udmcfg.conf
diff --git a/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl b/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
index 5140888..6610900 100644
--- a/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
+++ b/omec/5g-control-plane/templates/bin/_udr-run.sh.tpl
@@ -12,7 +12,6 @@
 
 cd /free5gc
 cp /tmp/config/* config/
-sed -i "s/POD_IP/${POD_IP}/g" config/udrcfg.conf
 
 cat config/free5GC.conf
 cat config/udrcfg.conf
diff --git a/omec/5g-control-plane/templates/configmap-amf.yaml b/omec/5g-control-plane/templates/configmap-amf.yaml
index 675e85b..7c37da5 100644
--- a/omec/5g-control-plane/templates/configmap-amf.yaml
+++ b/omec/5g-control-plane/templates/configmap-amf.yaml
@@ -10,20 +10,12 @@
 {{- $amfcfg := index .Values.config.amf.cfgFiles "amfcfg.conf" }}
 {{- $sbi := index $amfcfg.configuration "sbi" }}
 
-{{- if not (hasKey $sbi "registerIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "registerIPv4" -}}
-{{- end }}
-{{- if not (hasKey $sbi "bindingIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "bindingIPv4" -}}
-{{- end }}
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.amf.sbi.port | set $sbi "port" -}}
 {{- end }}
 
-{{- if not (hasKey $amfcfg.configuration "ngapIpList") -}}
-{{- $_ := list "POD_IP" | set $amfcfg.configuration "ngapIpList" -}}
 {{- end }}
-{{- end }}
+
 
 ---
 apiVersion: v1
diff --git a/omec/5g-control-plane/templates/configmap-ausf.yaml b/omec/5g-control-plane/templates/configmap-ausf.yaml
index b1435ed..27a3bbc 100644
--- a/omec/5g-control-plane/templates/configmap-ausf.yaml
+++ b/omec/5g-control-plane/templates/configmap-ausf.yaml
@@ -10,12 +10,6 @@
 {{- $ausfcfg := index .Values.config.ausf.cfgFiles "ausfcfg.conf" }}
 {{- $sbi := index $ausfcfg.configuration "sbi" }}
 
-{{- if not (hasKey $sbi "registerIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "registerIPv4" -}}
-{{- end }}
-{{- if not (hasKey $sbi "bindingIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "bindingIPv4" -}}
-{{- end }}
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.ausf.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-nrf.yaml b/omec/5g-control-plane/templates/configmap-nrf.yaml
index 5841f22..04ac1e1 100644
--- a/omec/5g-control-plane/templates/configmap-nrf.yaml
+++ b/omec/5g-control-plane/templates/configmap-nrf.yaml
@@ -21,12 +21,6 @@
 {{- $_ := "POD_IP" | set $config "DefaultServiceIP" -}}
 {{- end }}
 
-{{- if not (hasKey $sbi "registerIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "registerIPv4" -}}
-{{- end }}
-{{- if not (hasKey $sbi "bindingIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "bindingIPv4" -}}
-{{- end }}
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.nrf.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-nssf.yaml b/omec/5g-control-plane/templates/configmap-nssf.yaml
index d30b070..0d9bebb 100644
--- a/omec/5g-control-plane/templates/configmap-nssf.yaml
+++ b/omec/5g-control-plane/templates/configmap-nssf.yaml
@@ -10,12 +10,6 @@
 {{- $nssfcfg := index .Values.config.nssf.cfgFiles "nssfcfg.conf" }}
 {{- $sbi := index $nssfcfg.configuration "sbi" }}
 
-{{- if not (hasKey $sbi "registerIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "registerIPv4" -}}
-{{- end }}
-{{- if not (hasKey $sbi "bindingIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "bindingIPv4" -}}
-{{- end }}
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.nssf.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-pcf.yaml b/omec/5g-control-plane/templates/configmap-pcf.yaml
index b0af3f7..df584d9 100644
--- a/omec/5g-control-plane/templates/configmap-pcf.yaml
+++ b/omec/5g-control-plane/templates/configmap-pcf.yaml
@@ -10,12 +10,6 @@
 {{- $pcfcfg := index .Values.config.pcf.cfgFiles "pcfcfg.conf" }}
 {{- $sbi := index $pcfcfg.configuration "sbi" }}
 
-{{- if not (hasKey $sbi "registerIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "registerIPv4" -}}
-{{- end }}
-{{- if not (hasKey $sbi "bindingIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "bindingIPv4" -}}
-{{- end }}
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.pcf.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-smf.yaml b/omec/5g-control-plane/templates/configmap-smf.yaml
index 18120b0..87f1243 100644
--- a/omec/5g-control-plane/templates/configmap-smf.yaml
+++ b/omec/5g-control-plane/templates/configmap-smf.yaml
@@ -13,12 +13,6 @@
 {{- if not (hasKey $smfcfg.configuration "pfcp") -}}
 {{- $_ := dict "addr" "POD_IP" | set $smfcfg.configuration "pfcp" -}}
 {{- end }}
-{{- if not (hasKey $sbi "registerIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "registerIPv4" -}}
-{{- end }}
-{{- if not (hasKey $sbi "bindingIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "bindingIPv4" -}}
-{{- end }}
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.smf.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-udm.yaml b/omec/5g-control-plane/templates/configmap-udm.yaml
index ea6786b..5a15d72 100644
--- a/omec/5g-control-plane/templates/configmap-udm.yaml
+++ b/omec/5g-control-plane/templates/configmap-udm.yaml
@@ -10,12 +10,6 @@
 {{- $udmcfg := index .Values.config.udm.cfgFiles "udmcfg.conf" }}
 {{- $sbi := index $udmcfg.configuration "sbi" }}
 
-{{- if not (hasKey $sbi "registerIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "registerIPv4" -}}
-{{- end }}
-{{- if not (hasKey $sbi "bindingIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "bindingIPv4" -}}
-{{- end }}
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.udm.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/templates/configmap-udr.yaml b/omec/5g-control-plane/templates/configmap-udr.yaml
index 5ce0dc4..e17957d 100644
--- a/omec/5g-control-plane/templates/configmap-udr.yaml
+++ b/omec/5g-control-plane/templates/configmap-udr.yaml
@@ -15,12 +15,6 @@
 {{- $_ := dict "name" .Values.config.mongodb.name "url" .Values.config.mongodb.url | set $config "mongodb" -}}
 {{- end }}
 
-{{- if not (hasKey $sbi "registerIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "registerIPv4" -}}
-{{- end }}
-{{- if not (hasKey $sbi "bindingIPv4") -}}
-{{- $_ := "POD_IP" | set $sbi "bindingIPv4" -}}
-{{- end }}
 {{- if not (hasKey $sbi "port") -}}
 {{- $_ := .Values.config.udr.sbi.port | set $sbi "port" -}}
 {{- end }}
diff --git a/omec/5g-control-plane/values.yaml b/omec/5g-control-plane/values.yaml
index 49432f8..50622ac 100644
--- a/omec/5g-control-plane/values.yaml
+++ b/omec/5g-control-plane/values.yaml
@@ -229,6 +229,8 @@
             - nudm-pp
           sbi:
             scheme: http
+            bindingIPv4: "0.0.0.0"
+            registerIPv4: udm
             tls:
               log: free5gc/udmsslkey.log
               pem: free5gc/support/TLS/udm.pem
@@ -265,6 +267,8 @@
           nrfUri: http://nrf:29510
           sbi:
             scheme: http
+            bindingIPv4: "0.0.0.0"
+            registerIPv4: udr
   pcf:
     deploy: true
     podAnnotations:
@@ -290,6 +294,8 @@
           nrfUri: http://nrf:29510
           sbi:
             scheme: http
+            bindingIPv4: "0.0.0.0"
+            registerIPv4: pcf
           defaultBdtRefId: BdtPolicyId-
           serviceList:
             - serviceName: npcf-am-policy-control
@@ -325,6 +331,8 @@
           nrfUri: http://nrf:29510
           sbi:
             scheme: http
+            bindingIPv4: "0.0.0.0"
+            registerIPv4: nssf
           serviceNameList:
             - nnssf-nsselection
             - nnssf-nssaiavailability
@@ -364,6 +372,8 @@
       nodePort:
         enabled: true
         port: 30071
+        ngapIpList:
+            - "0.0.0.0"
     cfgFiles:
       # https://github.com/free5gc/free5gc/blob/main/config/amfcfg.yaml
       amfcfg.conf:
@@ -375,6 +385,8 @@
           nrfUri: http://nrf:29510
           sbi:
             scheme: http
+            bindingIPv4: "0.0.0.0"
+            registerIPv4: amf
           serviceNameList:
             - namf-comm
             - namf-evts
@@ -429,6 +441,8 @@
         configuration:
           sbi:
             scheme: http
+            bindingIPv4: "0.0.0.0"
+            registerIPv4: nrf
           DefaultPlmnId:
             mcc: 208
             mnc: 93
@@ -469,6 +483,8 @@
           nrfUri: http://nrf:29510
           sbi:
             scheme: http
+            bindingIPv4: "0.0.0.0"
+            registerIPv4: smf
             tls:
               key: gofree5gc/support/TLS/smf.key
               pem: gofree5gc/support/TLS/smf.pem
@@ -521,6 +537,8 @@
           nrfUri: http://nrf:29510
           sbi:
             scheme: http
+            bindingIPv4: "0.0.0.0"
+            registerIPv4: ausf
           serviceNameList:
             - nausf-auth
           plmnSupportList: