diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml
index 418a3ed..e76a1d9 100644
--- a/kubernetes/message-router/templates/all-services.yaml
+++ b/kubernetes/message-router/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableMessageRouterZookeeper }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@
   selector:
     app: zookeeper
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableMessageRouterGlobalKafka }}
 ---
 apiVersion: v1
 kind: Service
@@ -27,6 +30,8 @@
   selector:
     app: global-kafka
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableMessageRouterDmaap }}
 ---
 apiVersion: v1
 kind: Service
@@ -58,3 +63,4 @@
   selector:
     app: dmaap
   type: NodePort
+#{{ end }}
\ No newline at end of file