diff --git a/kubernetes/robot/templates/all-services.yaml b/kubernetes/robot/templates/all-services.yaml
index f126bc9..196e7b1 100644
--- a/kubernetes/robot/templates/all-services.yaml
+++ b/kubernetes/robot/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableRobotRobot }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,3 +13,4 @@
   selector:
     app: robot
   type: NodePort
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml
index da017db..561d795 100644
--- a/kubernetes/robot/templates/robot-deployment.yaml
+++ b/kubernetes/robot/templates/robot-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableRobotRobot }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -79,3 +80,4 @@
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/assets/asdc/base_vlb/dnsscaling.env
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file