diff --git a/playbooks/roles/nodepool-base/tasks/main.yaml b/playbooks/roles/nodepool-base/tasks/main.yaml
index 956a702ee5..055740a82f 100644
--- a/playbooks/roles/nodepool-base/tasks/main.yaml
+++ b/playbooks/roles/nodepool-base/tasks/main.yaml
@@ -67,7 +67,7 @@
 
 - name: Write nodepool config
   copy:
-    content: "{{ nodepool_config | to_nice_yaml }}"
+    content: "{{ nodepool_config | to_nice_yaml(indent=2) }}"
     dest: /etc/nodepool/nodepool.yaml
 
 - name: Symlink in elements from project-config repo
diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml
index c74b7612cf..caa54f7df4 100644
--- a/playbooks/zuul/run-base.yaml
+++ b/playbooks/zuul/run-base.yaml
@@ -103,7 +103,7 @@
     # otherwise throws a j2 formatting exception.
     - name: Write out testinfra extra data fixture
       copy:
-        content: "{{ testinfra_extra_data | default('') | to_nice_yaml }}"
+        content: "{{ testinfra_extra_data | default('') | to_nice_yaml(indent=2) }}"
         dest: '/home/zuul/testinfra_extra_data_fixture.yaml'
 
     - name: Run testinfra to validate configuration