diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
index dcf2f08..bdac10a 100644
--- a/components/opdk-install-component.yml
+++ b/components/opdk-install-component.yml
@@ -1,6 +1,7 @@
 ---
 - hosts: '{{ hosts }}'
   serial: 1
+  gather_facts: no
   roles:
   - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
diff --git a/components/opdk-update-installer.yml b/components/opdk-update-installer.yml
index 551efe2..f164836 100644
--- a/components/opdk-update-installer.yml
+++ b/components/opdk-update-installer.yml
@@ -1,6 +1,7 @@
 ---
 - hosts: '{{ hosts }}'
   serial: 1
+  gather_facts: no
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
diff --git a/components/opdk-upgrade-component.yml b/components/opdk-upgrade-component.yml
index 77894a5..f9eb1fe 100644
--- a/components/opdk-upgrade-component.yml
+++ b/components/opdk-upgrade-component.yml
@@ -1,6 +1,7 @@
 ---
 - hosts: '{{ hosts }}'
   serial: 1
+  gather_facts: no
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
diff --git a/configuration/opdk-set-reachable.yml b/configuration/opdk-set-reachable.yml
index ee00c66..28d8a21 100644
--- a/configuration/opdk-set-reachable.yml
+++ b/configuration/opdk-set-reachable.yml
@@ -1,6 +1,7 @@
 ---
 - hosts: '{{ hosts }}'
   serial: 1
+  gather_facts: no
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
diff --git a/configuration/update_cache.yml b/configuration/update_cache.yml
index 286fafb..afe1ecc 100644
--- a/configuration/update_cache.yml
+++ b/configuration/update_cache.yml
@@ -1,6 +1,7 @@
 ---
 - hosts: planet
   strategy: free
+  gather_facts: no
   vars_files:
   - ~/.apigee/credentials.yml
   pre_tasks:
diff --git a/upgrade.yml b/upgrade.yml
index 404b3c5..caafb90 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -5,6 +5,7 @@
   - cache
 
 - name: All components should be running
+  gather_facts: no
   hosts: planet
   tags: ['start']
   serial: 1
@@ -140,6 +141,7 @@
 - name: Restore broken pg_control file on pgmaster
   hosts: pgmaster
   serial: 1
+  gather_facts: no
   become: yes
   tags: ['pg_control']
   vars:
@@ -195,6 +197,7 @@
 - name: Start Postgres components
   hosts: ps
   serial: 1
+  gather_facts: no
   tags: ['pg', 'pgstart']
   vars_files:
   - ~/.apigee/credentials.yml
@@ -212,6 +215,7 @@
   hosts: pgmaster
   tags: ['pg', 'pgmaster_validate']
   serial: 1
+  gather_facts: no
   vars_files:
   - ~/.apigee/credentials.yml
   tasks:
@@ -221,6 +225,7 @@
 - name: Setup and Validate that PG Standby is standby
   hosts: pgstandby
   tags: ['pg', 'pgstandby']
+  gather_facts: no
   serial: 1
   vars_files:
   - ~/.apigee/credentials.yml
diff --git a/validations/opdk-setup-log-files.yml b/validations/opdk-setup-log-files.yml
index cb7591d..8e14d6f 100644
--- a/validations/opdk-setup-log-files.yml
+++ b/validations/opdk-setup-log-files.yml
@@ -2,6 +2,7 @@
 - hosts: '{{ hosts }}'
   become: true
   strategy: free
+  gather_facts: no
   vars:
     pattern:
     - { dir: '/etc/', pattern: 'hosts' }