diff --git a/5g-control-plane/templates/configmap-amf.yaml b/5g-control-plane/templates/configmap-amf.yaml
index 10ecaed..6ebacf7 100644
--- a/5g-control-plane/templates/configmap-amf.yaml
+++ b/5g-control-plane/templates/configmap-amf.yaml
@@ -30,6 +30,10 @@
 {{- $_ := .Values.config.sctplb.deploy | set $amfcfg.configuration "enableSctpLb" -}}
 {{- end }}
 
+{{- if not (hasKey $amfcfg.configuration "nfKafka") -}}
+{{- $_ := .Values.kafka.nfKafka | set $amfcfg.configuration "nfKafka" -}}
+{{- $_ := .Values.kafka.deploy | set $amfcfg.configuration.nfKafka "enable" -}}
+{{- end }}
 
 {{- end }}