diff --git a/kubernetes/cli/templates/all-service.yaml b/kubernetes/cli/templates/all-service.yaml
index ffd9f68..e848bfd 100644
--- a/kubernetes/cli/templates/all-service.yaml
+++ b/kubernetes/cli/templates/all-service.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableCliCli }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -14,3 +15,4 @@
   type: NodePort
   selector:
     app: cli
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/cli/templates/cli-deployment.yaml b/kubernetes/cli/templates/cli-deployment.yaml
index 88cb3eb..3a702b9 100644
--- a/kubernetes/cli/templates/cli-deployment.yaml
+++ b/kubernetes/cli/templates/cli-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableCliCli }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -32,3 +33,4 @@
           periodSeconds: 10
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file