diff --git a/installations/dc2/components/opdk-install-component.yml b/installations/dc2/components/opdk-install-component.yml
index c2b5cd2..279d06a 100644
--- a/installations/dc2/components/opdk-install-component.yml
+++ b/installations/dc2/components/opdk-install-component.yml
@@ -4,9 +4,11 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-apigee-user
   tags:
-  - user
+  - apigee-user
+  - apigee-pre-req
 
 - hosts: '{{ hosts }}'
   strategy: free
@@ -16,13 +18,15 @@
   - apigee-opdk-setup-os-limits
 #  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
-  - os
+  - apigee-pre-req
+  - apigee-tuning
 
 - hosts: '{{ hosts }}'
   strategy: free
   roles:
   - apigee-opdk-setup-openjdk
   tags:
+  - apigee-pre-req
   - openjdk
 
 - hosts: '{{ hosts }}'
@@ -30,9 +34,11 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - apigee-opdk-setup-default-settings
   - apigee-opdk-setup-bootstrap
   tags:
-  - bootstrap
+  - apigee-pre-req
+  - apigee-bootstrap
 
 - hosts: '{{ hosts }}'
   strategy: free
@@ -43,12 +49,14 @@
   - apigee-opdk-setup-component-installer
 #  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
   tags:
-  - installer
+  - apigee-pre-req
+  - apigee-installer
 
 - hosts: '{{ hosts }}'
   serial: 1
   roles:
+  - apigee-opdk-setup-default-settings
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
 #  - { role: apigee-fetch-files, fetch_files: '{{ apigee_log_files }}', fetched_files_dir: '{{ fetched_logs_dir }}' }
   tags:
-  - component
+  - apigee-component
diff --git a/installations/dc2/configuration/opdk-setup-org-config.yml b/installations/dc2/configuration/opdk-setup-org-config.yml
index d24ed2e..6b2e672 100644
--- a/installations/dc2/configuration/opdk-setup-org-config.yml
+++ b/installations/dc2/configuration/opdk-setup-org-config.yml
@@ -1,6 +1,8 @@
 ---
 - hosts: '{{ hosts }}'
   strategy: free
+  vars_files:
+  - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-org-config
 
diff --git a/installations/dc2/configuration/opdk-setup-org.yml b/installations/dc2/configuration/opdk-setup-org.yml
index e3911bf..002ae70 100644
--- a/installations/dc2/configuration/opdk-setup-org.yml
+++ b/installations/dc2/configuration/opdk-setup-org.yml
@@ -1,5 +1,7 @@
 ---
 - hosts: '{{ hosts }}'
+  vars_files:
+  - ~/.apigee/credentials.yml
   strategy: free
   roles:
   - apigee-opdk-setup-org