diff --git a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
index 9df3aa8..d6b1940 100644
--- a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
+++ b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: kube2msb-registrator
-  namespace: "{{ .Values.nsPrefix }}-kube2msb"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   replicas: 1
   selector:
@@ -26,8 +26,8 @@
         - name: AUTH_TOKEN
           value: {{ .Values.kubeMasterAuthToken }}
         - name: MSB_URL
-          value: {{ .Values.discoveryUrl }}
+          value: {{tpl $.Values.discoveryUrl .}}
         imagePullPolicy: {{ .Values.pullPolicy }}
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}