diff --git a/apigee_mirror/configuration/opdk-credentials.yml b/apigee_mirror/configuration/load-opdk-credentials.yml
similarity index 100%
rename from apigee_mirror/configuration/opdk-credentials.yml
rename to apigee_mirror/configuration/load-opdk-credentials.yml
diff --git a/apigee_mirror/upload_install_apigee_mirror.yml b/apigee_mirror/upload_install_apigee_mirror.yml
index 245dbad..3b024c6 100644
--- a/apigee_mirror/upload_install_apigee_mirror.yml
+++ b/apigee_mirror/upload_install_apigee_mirror.yml
@@ -1,5 +1,5 @@
 ---
-- include: configuration/opdk-credentials.yml
+- include: configuration/load-opdk-credentials.yml
   vars:
     hosts: 'planet'
 
diff --git a/backups/backup.yml b/backups/backup.yml
index 5d211a3..abcd706 100644
--- a/backups/backup.yml
+++ b/backups/backup.yml
@@ -1,5 +1,5 @@
 ---
-- include: configuration/opdk-credentials.yml
+- include: configuration/load-opdk-credentials.yml
   vars:
     hosts: 'planet'
   tags:
diff --git a/backups/configuration/opdk-credentials.yml b/backups/configuration/load-opdk-credentials.yml
similarity index 100%
rename from backups/configuration/opdk-credentials.yml
rename to backups/configuration/load-opdk-credentials.yml
diff --git a/installations/aio/configuration/opdk-credentials.yml b/installations/aio/configuration/load-opdk-credentials.yml
similarity index 100%
rename from installations/aio/configuration/opdk-credentials.yml
rename to installations/aio/configuration/load-opdk-credentials.yml
diff --git a/installations/aio/installation.yml b/installations/aio/installation.yml
index f2a23b2..324eab1 100644
--- a/installations/aio/installation.yml
+++ b/installations/aio/installation.yml
@@ -1,7 +1,7 @@
 ---
 - include: configuration/update_cache.yml
 
-- include: configuration/opdk-credentials.yml
+- include: configuration/load-opdk-credentials.yml
   vars:
     hosts: planet
   tags:
diff --git a/installations/baas/configuration/opdk-credentials.yml b/installations/baas/configuration/load-opdk-credentials.yml
similarity index 100%
rename from installations/baas/configuration/opdk-credentials.yml
rename to installations/baas/configuration/load-opdk-credentials.yml
diff --git a/installations/baas/installation.yml b/installations/baas/installation.yml
index d0dde51..f88d91c 100644
--- a/installations/baas/installation.yml
+++ b/installations/baas/installation.yml
@@ -4,7 +4,7 @@
   - cache
   - os-pre-req
 
-- include: configuration/opdk-credentials.yml
+- include: configuration/load-opdk-credentials.yml
   vars:
     hosts: 'planet'
   tags:
diff --git a/installations/dc1/configuration/opdk-credentials.yml b/installations/dc1/configuration/load-opdk-credentials.yml
similarity index 100%
rename from installations/dc1/configuration/opdk-credentials.yml
rename to installations/dc1/configuration/load-opdk-credentials.yml
diff --git a/installations/dc1/installation.yml b/installations/dc1/installation.yml
index ce68c21..db1e7d8 100644
--- a/installations/dc1/installation.yml
+++ b/installations/dc1/installation.yml
@@ -5,12 +5,13 @@
   - os-pre-req
   - apigee-pre-req
 
-- include: configuration/opdk-credentials.yml
+- include: configuration/load-opdk-credentials.yml
   vars:
     hosts: 'planet'
   tags:
   - credentials
   - os-pre-req
+  - apigee-pre-req
 
 - include: configuration/opdk-setup-os.yml
   vars:
diff --git a/installations/dc2/configuration/opdk-credentials.yml b/installations/dc2/configuration/load-opdk-credentials.yml
similarity index 100%
rename from installations/dc2/configuration/opdk-credentials.yml
rename to installations/dc2/configuration/load-opdk-credentials.yml
diff --git a/installations/dc2/installation.yml b/installations/dc2/installation.yml
index 9f067e8..8822568 100644
--- a/installations/dc2/installation.yml
+++ b/installations/dc2/installation.yml
@@ -3,13 +3,15 @@
   tags:
   - cache
   - os-pre-req
+  - apigee-pre-req
 
-- include: configuration/opdk-credentials.yml
+- include: configuration/load-opdk-credentials.yml
   vars:
     hosts: 'planet'
   tags:
   - credentials
   - os-pre-req
+  - apigee-pre-req
 
 - include: configuration/opdk-setup-os.yml
   vars:
diff --git a/installations/monetization/configuration/opdk-credentials.yml b/installations/monetization/configuration/load-opdk-credentials.yml
similarity index 100%
rename from installations/monetization/configuration/opdk-credentials.yml
rename to installations/monetization/configuration/load-opdk-credentials.yml
diff --git a/installations/monetization/installation.yml b/installations/monetization/installation.yml
index bdedfcc..1a561b1 100644
--- a/installations/monetization/installation.yml
+++ b/installations/monetization/installation.yml
@@ -4,7 +4,7 @@
   - cache
   - os-pre-req
 
-- include: configuration/opdk-credentials.yml
+- include: configuration/load-opdk-credentials.yml
   vars:
     hosts: 'planet'
   tags:
diff --git a/installations/baas/configuration/opdk-credentials.yml b/installations/updates/configuration/load-opdk-credentials.yml
similarity index 100%
copy from installations/baas/configuration/opdk-credentials.yml
copy to installations/updates/configuration/load-opdk-credentials.yml