diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml
index dc375cb..3f714f3 100644
--- a/kubernetes/aai/templates/aai-deployment.yaml
+++ b/kubernetes/aai/templates/aai-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiService }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -68,3 +69,4 @@
       restartPolicy: Always
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file