diff --git a/charts/dns-ns-controller/templates/api-config.yaml b/charts/dns-ns-controller/templates/api-config.yaml
index e489493..f902fd8 100644
--- a/charts/dns-ns-controller/templates/api-config.yaml
+++ b/charts/dns-ns-controller/templates/api-config.yaml
@@ -4,5 +4,5 @@
   name: {{ .Values.apiConfigMapName }}
   namespace: {{ .Release.Namespace }}
 data:
-  createTXTAddr: "http://controller-manager.{{ .Release.Namespace }}.svc.cluster.local/create-txt-record"
-  deleteTXTAddr: "http://controller-manager.{{ .Release.Namespace }}.svc.cluster.local/delete-txt-record"
+  createTXTAddr: "http://ns-controller.{{ .Release.Namespace }}.svc.cluster.local/create-txt-record"
+  deleteTXTAddr: "http://ns-controller.{{ .Release.Namespace }}.svc.cluster.local/delete-txt-record"
diff --git a/charts/dns-ns-controller/templates/install.yaml b/charts/dns-ns-controller/templates/install.yaml
index 11210d4..555b170 100644
--- a/charts/dns-ns-controller/templates/install.yaml
+++ b/charts/dns-ns-controller/templates/install.yaml
@@ -205,7 +205,7 @@
 metadata:
   labels:
     control-plane: controller-manager
-  name: ns-controller
+  name: ns-controller # TODO(gio): move to _helpers
   namespace: {{ .Release.Namespace }}
 spec:
   ports: