diff --git a/bootstrap_puppet_infra_nodes.yml b/bootstrap_puppet_infra_nodes.yml
index 84922e2..4b2dcd5 100644
--- a/bootstrap_puppet_infra_nodes.yml
+++ b/bootstrap_puppet_infra_nodes.yml
@@ -1,6 +1,7 @@
 ---
 # file: bootstrap_puppet_infra_nodes.yml
 - hosts: infra:!meta-infra_type_puppetmaster
+  gather_facts: no
   user: ubuntu
   sudo: true
   roles:
diff --git a/bootstrap_puppetmaster.yml b/bootstrap_puppetmaster.yml
index e9a58dd..37ea1ac 100644
--- a/bootstrap_puppetmaster.yml
+++ b/bootstrap_puppetmaster.yml
@@ -1,6 +1,7 @@
 ---
 # file: bootstrap_puppetmaster.yml
 - hosts: meta-infra_type_puppetmaster
+  gather_facts: no
   user: ubuntu
   sudo: true
   roles:
diff --git a/common.yml b/common.yml
index ce3cf6f..91859b8 100644
--- a/common.yml
+++ b/common.yml
@@ -1,6 +1,7 @@
 ---
 # file: common.yml
 - hosts: infra
+  gather_facts: no
   user: ubuntu
   sudo: true
   roles:
diff --git a/deploy_hiera.yml b/deploy_hiera.yml
index 93b57c0..b9b18de 100644
--- a/deploy_hiera.yml
+++ b/deploy_hiera.yml
@@ -1,6 +1,7 @@
 ---
 # file: deploy_hiera.yml
 - hosts: meta-infra_type_puppetmaster
+  gather_facts: no
   user: ubuntu
   sudo: true
   roles:
diff --git a/deploy_system_config.yml b/deploy_system_config.yml
index f29730f..edfd0b5 100644
--- a/deploy_system_config.yml
+++ b/deploy_system_config.yml
@@ -1,6 +1,7 @@
 ---
 # file: deploy_system_config.yml
 - hosts: localhost
+  gather_facts: no
   connection: local
   roles:
     - { role: deploy_system_config }
diff --git a/post_puppet_gerrit.yml b/post_puppet_gerrit.yml
index 69f4442..d7061e2 100644
--- a/post_puppet_gerrit.yml
+++ b/post_puppet_gerrit.yml
@@ -1,6 +1,7 @@
 ---
 # file: post_puppet_gerrit.yml
 - hosts: meta-infra_type_gerrit
+  gather_facts: no
   user: ubuntu
   sudo: true
   roles:
diff --git a/post_puppet_jenkins.yml b/post_puppet_jenkins.yml
index b92b496..79fa7bd 100644
--- a/post_puppet_jenkins.yml
+++ b/post_puppet_jenkins.yml
@@ -1,6 +1,7 @@
 ---
 # file: post_puppet_jenkins.yml
 - hosts: meta-infra_type_jenkins
+  gather_facts: no
   user: ubuntu
   sudo: true
   roles:
diff --git a/pre_puppet_gerrit.yml b/pre_puppet_gerrit.yml
index 03f2407..9bbbe7f 100644
--- a/pre_puppet_gerrit.yml
+++ b/pre_puppet_gerrit.yml
@@ -1,6 +1,7 @@
 ---
 # file: pre_puppet_gerrit.yml
 - hosts: meta-infra_type_gerrit
+  gather_facts: no
   user: ubuntu
   sudo: true
   roles:
diff --git a/run_puppet_infra_nodes.yml b/run_puppet_infra_nodes.yml
index ae2f99d..b991049 100644
--- a/run_puppet_infra_nodes.yml
+++ b/run_puppet_infra_nodes.yml
@@ -1,6 +1,7 @@
 ---
 # file: run_puppet_infra_nodes
 - hosts: infra:!meta-infra_type_puppetmaster
+  gather_facts: no
   user: ubuntu
   sudo: true
   roles:
diff --git a/set_hostnames.yml b/set_hostnames.yml
index 5408ff2..2e9c541 100644
--- a/set_hostnames.yml
+++ b/set_hostnames.yml
@@ -1,6 +1,7 @@
 ---
 # file: set_hostnames.yml
 - hosts: infra
+  gather_facts: no
   user: ubuntu
   sudo: true
   roles:
diff --git a/sign_infra_nodes_certs.yml b/sign_infra_nodes_certs.yml
index adee7af..fd29a91 100644
--- a/sign_infra_nodes_certs.yml
+++ b/sign_infra_nodes_certs.yml
@@ -1,6 +1,7 @@
 ---
 # file: sign_infra_nodes_certs
 - hosts: meta-infra_type_puppetmaster
+  gather_facts: no
   user: ubuntu
   sudo: true
   roles: