diff --git a/charts/oai-5g-ran/oai-gnb/templates/deployment.yaml b/charts/oai-5g-ran/oai-gnb/templates/deployment.yaml
index 8435ae6d381ca9aa11c19e09d3de263ae20007c9..941beb6d245a9ad2456b50882221c7a67ece29da 100644
--- a/charts/oai-5g-ran/oai-gnb/templates/deployment.yaml
+++ b/charts/oai-5g-ran/oai-gnb/templates/deployment.yaml
@@ -125,6 +125,16 @@ spec:
               configMapKeyRef:
                 name: {{ .Chart.Name }}-configmap
                 key: amfIpAddress
+          - name: USE_FQDN
+            valueFrom:
+              configMapKeyRef:
+                name: {{ .Chart.Name }}-configmap
+                key: useFqdn
+          - name: AMF_FQDN
+            valueFrom:
+              configMapKeyRef:
+                name: {{ .Chart.Name }}-configmap
+                key: amfFqdn
           - name: GNB_NGA_IF_NAME
             valueFrom:
               configMapKeyRef:
diff --git a/charts/oai-5g-ran/oai-gnb/values.yaml b/charts/oai-5g-ran/oai-gnb/values.yaml
index e4bf37e026aada8fb6814bba82f506893d44fc89..bbf158352f83385b461b104a25126a76d7bf2e93 100644
--- a/charts/oai-5g-ran/oai-gnb/values.yaml
+++ b/charts/oai-5g-ran/oai-gnb/values.yaml
@@ -83,7 +83,9 @@ config:
   nssaiSst: "1"  #currently only 4 standard values are allowed 1,2,3,4 
   nssaiSd0: "0027db"    #values in hexa-decimal format
   nssaiSd1: "112233"
-  amfIpAddress: "172.17.0.8"  # amf ip-address
+  useFqdn: "true"
+  amfFqdn: "oai-amf-svc"
+  amfIpAddress: "0.0.0.0"  # amf ip-address or service-name
   gnbNgaIfName: "eth0"            # net1 in case multus create is true that means another interface is created for ngap interface, n2 to communicate with amf
   gnbNgaIpAddress: "status.podIP" # n2IPadd in case multus create is true
   gnbNguIfName: "eth0"   #net2 in case multus create is true gtu interface for upf/spgwu