diff --git a/charts/datacenter/manuela-tst/templates/messaging/messaging-is.yaml b/charts/datacenter/manuela-tst/templates/messaging/messaging-is.yaml
index a900bebf8..2e4a3cfac 100644
--- a/charts/datacenter/manuela-tst/templates/messaging/messaging-is.yaml
+++ b/charts/datacenter/manuela-tst/templates/messaging/messaging-is.yaml
@@ -11,7 +11,7 @@ spec:
     importPolicy: {}
     referencePolicy:
       type: Local
-{{- range .Values.iot_consumer.built_tags }}
+{{- if .Values.iot_consumer.built_tags }}
   - name: {{ . | quote }}
     from:
       kind: DockerImage
diff --git a/charts/factory/manuela-stormshift/templates/messaging/messaging-is.yaml b/charts/factory/manuela-stormshift/templates/messaging/messaging-is.yaml
index bd7a60c06..0e9ca9d56 100644
--- a/charts/factory/manuela-stormshift/templates/messaging/messaging-is.yaml
+++ b/charts/factory/manuela-stormshift/templates/messaging/messaging-is.yaml
@@ -14,7 +14,7 @@ spec:
     importPolicy: {}
     referencePolicy:
       type: Local
-{{- range .Values.iot_consumer.built_tags }}
+{{- if .Values.iot_consumer.built_tags }}
   - name: {{ $.Values.iot_consumer.tag | quote }}
     from:
       kind: DockerImage