diff --git a/kubernetes/aaf/templates/all-services.yaml b/kubernetes/aaf/templates/all-services.yaml
index 0d1dc22..be04180 100644
--- a/kubernetes/aaf/templates/all-services.yaml
+++ b/kubernetes/aaf/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAafAafCs }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -18,6 +19,8 @@
   selector:
     app: aaf-cs
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableAafAaf }}
 ---
 apiVersion: v1
 kind: Service
@@ -34,3 +37,4 @@
   selector:
     app: clamp
   type: NodePort
+#{{ end }}
\ No newline at end of file