diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml
index f752608..4873473 100644
--- a/kubernetes/msb/templates/all-services.yaml
+++ b/kubernetes/msb/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsbMsbConsul }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@
   selector:
     app: msb-consul
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMsbMsbDiscovery }}
 ---
 apiVersion: v1
 kind: Service
@@ -28,6 +31,8 @@
   selector:
     app: msb-discovery
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMsbMsbIag }}
 ---
 apiVersion: v1
 kind: Service
@@ -43,6 +48,8 @@
   selector:
     app: msb-iag
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableMsbMsbEag }}
 ---
 apiVersion: v1
 kind: Service
@@ -58,3 +65,4 @@
   selector:
     app: msb-eag
   type: NodePort
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml
index fc8a95a..4d462aa 100644
--- a/kubernetes/msb/templates/msb-consul-deployment.yaml
+++ b/kubernetes/msb/templates/msb-consul-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsbMsbConsul }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -27,4 +28,5 @@
             port: {{ .Values.consulPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-        imagePullPolicy: {{ .Values.pullPolicy }}
\ No newline at end of file
+        imagePullPolicy: {{ .Values.pullPolicy }}
+#{{ end }}
\ No newline at end of file
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
diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
index db703d9..5611f91 100644
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-eag-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsbMsbEag }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -37,4 +38,4 @@
         imagePullPolicy: {{ .Values.pullPolicy}}
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml
index 35fba56..476eb3f 100644
--- a/kubernetes/msb/templates/msb-iag-deployment.yaml
+++ b/kubernetes/msb/templates/msb-iag-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMsbMsbIag }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -37,4 +38,4 @@
         imagePullPolicy: "{{ .Values.pullPolicy}}"
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-
+#{{ end }}
\ No newline at end of file