diff --git a/kubernetes/robot/templates/all-services.yaml b/kubernetes/robot/templates/all-services.yaml
index 196e7b1..604982b 100644
--- a/kubernetes/robot/templates/all-services.yaml
+++ b/kubernetes/robot/templates/all-services.yaml
@@ -5,7 +5,7 @@
   labels:
     app: robot
   name: robot
-  namespace: "{{ .Values.nsPrefix }}-robot"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - port: 88
diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml
index 5130955..ac176c4 100644
--- a/kubernetes/robot/templates/robot-deployment.yaml
+++ b/kubernetes/robot/templates/robot-deployment.yaml
@@ -3,7 +3,7 @@
 kind: Deployment
 metadata:
   name: robot
-  namespace: "{{ .Values.nsPrefix }}-robot"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -60,4 +60,4 @@
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/authorization
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}