diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index f9fb5a0..d80905a 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -10,7 +10,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.8.3
+version: 0.8.4
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/templates/deployment-smf.yaml b/5g-control-plane/templates/deployment-smf.yaml
index d60c7f7..28e6ee1 100644
--- a/5g-control-plane/templates/deployment-smf.yaml
+++ b/5g-control-plane/templates/deployment-smf.yaml
@@ -63,6 +63,8 @@
           value: {{ .Values.config.grpc.trace | quote }}
         - name: GRPC_VERBOSITY
           value: {{ .Values.config.grpc.verbosity | quote }}
+        - name: PFCP_PORT_UPF
+          value: {{ .Values.config.smf.upfPort | quote }}
         - name: POD_IP
           valueFrom:
             fieldRef:
diff --git a/5g-control-plane/templates/service-amf.yaml b/5g-control-plane/templates/service-amf.yaml
index 068d706..eafadf5 100644
--- a/5g-control-plane/templates/service-amf.yaml
+++ b/5g-control-plane/templates/service-amf.yaml
@@ -12,8 +12,10 @@
   name: amf
   labels:
 {{ tuple "amf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
+{{- with .Values.config.amf.serviceAnnotations }}
   annotations:
-    external-dns.beta.kubernetes.io/hostname: {{ .Values.config.amf.serviceAnnotations.amfFqdn }}
+    {{- toYaml . | nindent 4 }}
+{{- end }}
 spec:
   type: {{ .Values.config.amf.serviceType }}
 {{- if .Values.config.amf.ngapp.externalIp }}
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index dc196fd..cfcce4f 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -418,8 +418,8 @@
             - "0.0.0.0"
   amf:
     deploy: true
-    serviceAnnotations:
-      amfFqdn: "aether-amf.tenant-site.company.com"
+    # serviceAnnotations:
+    #   external-dns.alpha.kubernetes.io/hostname: "aether-amf.tenant-site.company.com"
     podAnnotations:
       field.cattle.io/workloadMetrics: '[{"path":"/metrics","port":9089,"schema":"HTTP"}]'
     serviceType: ClusterIP
@@ -558,6 +558,7 @@
     podAnnotations:
       field.cattle.io/workloadMetrics: '[{"path":"/metrics","port":9089,"schema":"HTTP"}]'
     serviceType: ClusterIP
+    upfPort: 8805
     n4:
       port: 8805
       # Provide nodePort when serviceType is NodePort