diff --git a/kubernetes/mock/templates/all-services.yaml b/kubernetes/mock/templates/all-services.yaml
index 8920191..a1b0f17 100644
--- a/kubernetes/mock/templates/all-services.yaml
+++ b/kubernetes/mock/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMockSniroEmulator }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,3 +16,4 @@
     name: http
   selector:
     app: sniro-emulator
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/mock/templates/sniroemulator-deployment.yaml b/kubernetes/mock/templates/sniroemulator-deployment.yaml
index a0473c9..5a1d483 100644
--- a/kubernetes/mock/templates/sniroemulator-deployment.yaml
+++ b/kubernetes/mock/templates/sniroemulator-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMockSniroEmulator }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -23,3 +24,4 @@
         args: ["--verbose"]
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file