diff --git a/installations/dc2/configuration/facts.yml b/installations/aio/configuration/update_cache.yml
similarity index 61%
rename from installations/dc2/configuration/facts.yml
rename to installations/aio/configuration/update_cache.yml
index eaf0d11..6404ede 100644
--- a/installations/dc2/configuration/facts.yml
+++ b/installations/aio/configuration/update_cache.yml
@@ -1,8 +1,11 @@
 ---
 - hosts: planet
+
   pre_tasks:
   - setup:
   - ec2_facts:
+    when: "{{ ansible_bios_version | lower | search('amazon') }}"
+
   roles:
   - apigee-opdk-setup-default-settings
 
diff --git a/installations/aio/installation-rollback.yml b/installations/aio/installation-rollback.yml
index e367310..2c7e889 100644
--- a/installations/aio/installation-rollback.yml
+++ b/installations/aio/installation-rollback.yml
@@ -1,4 +1,6 @@
 ---
+- include: configuration/update_cache.yml
+
 - hosts: planet
   roles:
   - { role: apigee-opdk-setup-bootstrap-rollback, remove_apigee: true }
diff --git a/installations/aio/installation.yml b/installations/aio/installation.yml
index 3c98cc0..f2a23b2 100644
--- a/installations/aio/installation.yml
+++ b/installations/aio/installation.yml
@@ -1,4 +1,6 @@
 ---
+- include: configuration/update_cache.yml
+
 - include: configuration/opdk-credentials.yml
   vars:
     hosts: planet
diff --git a/installations/dc2/configuration/facts.yml b/installations/baas/configuration/update_cache.yml
similarity index 61%
copy from installations/dc2/configuration/facts.yml
copy to installations/baas/configuration/update_cache.yml
index eaf0d11..6404ede 100644
--- a/installations/dc2/configuration/facts.yml
+++ b/installations/baas/configuration/update_cache.yml
@@ -1,8 +1,11 @@
 ---
 - hosts: planet
+
   pre_tasks:
   - setup:
   - ec2_facts:
+    when: "{{ ansible_bios_version | lower | search('amazon') }}"
+
   roles:
   - apigee-opdk-setup-default-settings
 
diff --git a/installations/baas/installation-rollback.yml b/installations/baas/installation-rollback.yml
index ba8e4d8..efae214 100644
--- a/installations/baas/installation-rollback.yml
+++ b/installations/baas/installation-rollback.yml
@@ -1,4 +1,6 @@
 ---
+- include: configuration/update_cache.yml
+
 - hosts: '{{ hosts }}'
   vars:
     remove_apigee: true
diff --git a/installations/baas/installation.yml b/installations/baas/installation.yml
index cad24be..17c0650 100644
--- a/installations/baas/installation.yml
+++ b/installations/baas/installation.yml
@@ -1,4 +1,6 @@
 ---
+- include: configuration/update_cache.yml
+
 - include: configuration/opdk-credentials.yml
   vars:
     hosts: 'planet'
diff --git a/installations/dc2/configuration/facts.yml b/installations/monetization/configuration/update_cache.yml
similarity index 61%
copy from installations/dc2/configuration/facts.yml
copy to installations/monetization/configuration/update_cache.yml
index eaf0d11..6404ede 100644
--- a/installations/dc2/configuration/facts.yml
+++ b/installations/monetization/configuration/update_cache.yml
@@ -1,8 +1,11 @@
 ---
 - hosts: planet
+
   pre_tasks:
   - setup:
   - ec2_facts:
+    when: "{{ ansible_bios_version | lower | search('amazon') }}"
+
   roles:
   - apigee-opdk-setup-default-settings
 
diff --git a/installations/monetization/installation.yml b/installations/monetization/installation.yml
index 3369557..e8a0e8c 100644
--- a/installations/monetization/installation.yml
+++ b/installations/monetization/installation.yml
@@ -1,4 +1,6 @@
 ---
+- include: configuration/update_cache.yml
+
 - include: configuration/opdk-credentials.yml
   vars:
     hosts: 'ms,rmp'