diff --git a/charts/modjo-microservice/templates/preview.service.yaml b/charts/modjo-microservice/templates/preview.service.yaml
index 96ee6ba..2b7bea7 100644
--- a/charts/modjo-microservice/templates/preview.service.yaml
+++ b/charts/modjo-microservice/templates/preview.service.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Values.rollout.strategy.type "BlueGreen" -}}
+{{- if and .Values.service.enabled (eq .Values.rollout.strategy.type "BlueGreen") -}}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/charts/modjo-microservice/templates/rollout.yaml b/charts/modjo-microservice/templates/rollout.yaml
index 01c5524..29b5a4d 100644
--- a/charts/modjo-microservice/templates/rollout.yaml
+++ b/charts/modjo-microservice/templates/rollout.yaml
@@ -19,8 +19,10 @@ spec:
   strategy:
     {{- if eq .Values.rollout.strategy.type "BlueGreen" }}
     blueGreen:
+      {{- if .Values.service.enabled }}
       activeService: {{ default (include "common.names.fullname" .) .Values.rollout.strategy.blueGreen.activeService | quote }}
       previewService: {{ default (include "common.names.suffixedName" (dict "root" . "suffix" "preview")) .Values.rollout.strategy.blueGreen.previewService | quote }}
+      {{- end }}
       autoPromotionEnabled: {{ .Values.rollout.strategy.blueGreen.autoPromotionEnabled }}
       previewReplicaCount: {{ .Values.rollout.strategy.blueGreen.previewReplicaCount }}
       antiAffinity:
@@ -59,6 +61,7 @@ spec:
             allowPrivilegeEscalation: false
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- if .Values.service.enabled }}
           ports:
             - name: http
               containerPort: 4000
@@ -71,6 +74,7 @@ spec:
             httpGet:
               path: /
               port: http
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts: