diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml
index 3af9e8f..5f8db61 100644
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsbMsbDiscovery }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -33,4 +34,4 @@
         imagePullPolicy: {{ .Values.pullPolicy }}
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
+#{{ end }}
\ No newline at end of file