diff --git a/roles/eda/templates/eda-activation-worker.deployment.yaml.j2 b/roles/eda/templates/eda-activation-worker.deployment.yaml.j2
index d61d43f..5cabcb0 100644
--- a/roles/eda/templates/eda-activation-worker.deployment.yaml.j2
+++ b/roles/eda/templates/eda-activation-worker.deployment.yaml.j2
@@ -62,7 +62,7 @@ spec:
 {% endif %}
 {% if combined_activation_worker.topology_spread_constraints is defined %} %}
       topologySpreadConstraints:
-        {{ combined_activation_worker.topology_spread_constraints | indent(width=8) }}
+        {{ combined_activation_worker.topology_spread_constraints | to_nice_yaml | indent(width=8) }}
 {% endif %}
       initContainers:
       - name: wait-for-migrations
diff --git a/roles/eda/templates/eda-api.deployment.yaml.j2 b/roles/eda/templates/eda-api.deployment.yaml.j2
index 94d4a17..73fec0d 100644
--- a/roles/eda/templates/eda-api.deployment.yaml.j2
+++ b/roles/eda/templates/eda-api.deployment.yaml.j2
@@ -67,7 +67,7 @@ spec:
 {% endif %}
 {% if combined_api.topology_spread_constraints is defined %}
       topologySpreadConstraints:
-        {{ combined_api.topology_spread_constraints | indent(width=8) }}
+        {{ combined_api.topology_spread_constraints | to_nice_yaml | indent(width=8) }}
 {% endif %}
       initContainers:
       - name: run-migrations
diff --git a/roles/eda/templates/eda-default-worker.deployment.yaml.j2 b/roles/eda/templates/eda-default-worker.deployment.yaml.j2
index aaa0f8c..6b4fbb3 100644
--- a/roles/eda/templates/eda-default-worker.deployment.yaml.j2
+++ b/roles/eda/templates/eda-default-worker.deployment.yaml.j2
@@ -62,7 +62,7 @@ spec:
 {% endif %}
 {% if combined_default_worker.topology_spread_constraints is defined %} %}
       topologySpreadConstraints:
-        {{ combined_default_worker.topology_spread_constraints | indent(width=8) }}
+        {{ combined_default_worker.topology_spread_constraints | to_nice_yaml | indent(width=8) }}
 {% endif %}
       initContainers:
       - name: wait-for-migrations
diff --git a/roles/eda/templates/eda-event-stream.deployment.yaml.j2 b/roles/eda/templates/eda-event-stream.deployment.yaml.j2
index 18ca8af..7616136 100644
--- a/roles/eda/templates/eda-event-stream.deployment.yaml.j2
+++ b/roles/eda/templates/eda-event-stream.deployment.yaml.j2
@@ -62,7 +62,7 @@ spec:
 {% endif %}
 {% if combined_event_stream.topology_spread_constraints is defined %}
       topologySpreadConstraints:
-        {{ combined_event_stream.topology_spread_constraints | indent(width=8) }}
+        {{ combined_event_stream.topology_spread_constraints | to_nice_yaml | indent(width=8) }}
 {% endif %}
       initContainers:
       - name: wait-for-migrations
diff --git a/roles/eda/templates/eda-scheduler.deployment.yaml.j2 b/roles/eda/templates/eda-scheduler.deployment.yaml.j2
index 4ea0510..8f18a57 100644
--- a/roles/eda/templates/eda-scheduler.deployment.yaml.j2
+++ b/roles/eda/templates/eda-scheduler.deployment.yaml.j2
@@ -61,7 +61,7 @@ spec:
 {% endif %}
 {% if combined_scheduler.topology_spread_constraints is defined %} %}
       topologySpreadConstraints:
-        {{ combined_scheduler.topology_spread_constraints | indent(width=8) }}
+        {{ combined_scheduler.topology_spread_constraints | to_nice_yaml | indent(width=8) }}
 {% endif %}
       initContainers:
       - name: wait-for-migrations
diff --git a/roles/eda/templates/eda-ui.deployment.yaml.j2 b/roles/eda/templates/eda-ui.deployment.yaml.j2
index 89d17ef..e633c26 100644
--- a/roles/eda/templates/eda-ui.deployment.yaml.j2
+++ b/roles/eda/templates/eda-ui.deployment.yaml.j2
@@ -61,7 +61,7 @@ spec:
 {% endif %}
 {% if combined_ui.topology_spread_constraints is defined %} %}
       topologySpreadConstraints:
-        {{ combined_ui.topology_spread_constraints | indent(width=8) }}
+        {{ combined_ui.topology_spread_constraints | to_nice_yaml | indent(width=8) }}
 {% endif %}
       containers:
       - name: eda-ui