diff --git a/playbooks/remote_puppet_adhoc.yaml b/playbooks/remote_puppet_adhoc.yaml
index 036fa91295..fc11debf07 100644
--- a/playbooks/remote_puppet_adhoc.yaml
+++ b/playbooks/remote_puppet_adhoc.yaml
@@ -3,4 +3,5 @@
   gather_facts: true
   roles:
   - role: puppet
-    manage_config: true
+    manage_config: True
+    puppet_reports: none
diff --git a/playbooks/remote_puppet_afs.yaml b/playbooks/remote_puppet_afs.yaml
index 21abd1214b..5657271e0c 100644
--- a/playbooks/remote_puppet_afs.yaml
+++ b/playbooks/remote_puppet_afs.yaml
@@ -4,3 +4,5 @@
   gather_facts: true
   roles:
   - role: puppet
+    manage_config: True
+    puppet_reports: none
diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml
index 4d2b49b893..e4afd0a5fe 100644
--- a/playbooks/remote_puppet_else.yaml
+++ b/playbooks/remote_puppet_else.yaml
@@ -3,3 +3,5 @@
   gather_facts: true
   roles:
   - role: puppet
+    manage_config: True
+    puppet_reports: none
diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index fb25743e65..a36f948af8 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -12,6 +12,8 @@
     - role: puppet
       copy_hieradata: False
       copy_puppet: False
+      manage_config: True
+      puppet_reports: none
 - hosts: "git0*:!disabled"
   strategy: free
   gather_facts: true
@@ -20,6 +22,8 @@
     - role: puppet
       facts:
         project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
+      manage_config: True
+      puppet_reports: none
 - hosts: "review.openstack.org:!disabled"
   strategy: free
   gather_facts: true
@@ -27,8 +31,9 @@
     - role: puppet
       facts:
         project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
-      vars:
-        puppet_timeout: 60m
+      puppet_timeout: 60m
+      manage_config: True
+      puppet_reports: none
 - hosts: "zuul-scheduler:!disabled"
   strategy: free
   gather_facts: true
@@ -36,5 +41,6 @@
     - role: puppet
       facts:
         project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
-      vars:
-        puppet_timeout: 60m
+      puppet_timeout: 60m
+      manage_config: True
+      puppet_reports: none
diff --git a/playbooks/remote_puppet_infracloud.yaml b/playbooks/remote_puppet_infracloud.yaml
index 8912c3b8c7..ac3a0c794a 100644
--- a/playbooks/remote_puppet_infracloud.yaml
+++ b/playbooks/remote_puppet_infracloud.yaml
@@ -4,11 +4,13 @@
   serial: 1
   roles:
     - role: puppet
-      manage_config: true
+      manage_config: True
+      puppet_reports: none
 - hosts: "compute*.ic.openstack.org:!disabled"
   gather_facts: true
   max_fail_percentage: 100
   serial: "10%"
   roles:
     - role: puppet
-      manage_config: true
+      manage_config: True
+      puppet_reports: none
diff --git a/playbooks/remote_puppet_infracloud_baremetal.yaml b/playbooks/remote_puppet_infracloud_baremetal.yaml
index ac025e577e..a162af165b 100644
--- a/playbooks/remote_puppet_infracloud_baremetal.yaml
+++ b/playbooks/remote_puppet_infracloud_baremetal.yaml
@@ -3,3 +3,5 @@
   gather_facts: true
   roles:
     - role: puppet
+      manage_config: True
+      puppet_reports: none