diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index 262da71..31a9b46 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.1
+version: 0.8.2
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/templates/service-amf.yaml b/5g-control-plane/templates/service-amf.yaml
index 5df3447..068d706 100644
--- a/5g-control-plane/templates/service-amf.yaml
+++ b/5g-control-plane/templates/service-amf.yaml
@@ -12,6 +12,8 @@
   name: amf
   labels:
 {{ tuple "amf" . | include "5g-control-plane.metadata_labels" | indent 4 }}
+  annotations:
+    external-dns.beta.kubernetes.io/hostname: {{ .Values.config.amf.serviceAnnotations.amfFqdn }}
 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 1d4b642..743c1a2 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -418,6 +418,8 @@
             - "0.0.0.0"
   amf:
     deploy: true
+    serviceAnnotations:
+      amfFqdn: "aether-amf.tenant-site.company.com"
     podAnnotations:
       field.cattle.io/workloadMetrics: '[{"path":"/metrics","port":9089,"schema":"HTTP"}]'
     serviceType: ClusterIP