diff --git a/installations/dc1/components/opdk-install-component.yml b/installations/dc1/components/opdk-install-component.yml
index b2d1397..b2b370f 100644
--- a/installations/dc1/components/opdk-install-component.yml
+++ b/installations/dc1/components/opdk-install-component.yml
@@ -1,63 +1,6 @@
 ---
 - hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-setup-apigee-user
-  tags:
-  - apigee-user
-  - apigee-pre-req
-
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-os-limits
-#  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
-  tags:
-  - apigee-pre-req
-  - apigee-tuning
-
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-openjdk
-  tags:
-  - apigee-pre-req
-  - openjdk
-
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
-  - apigee-opdk-setup-bootstrap
-  tags:
-  - apigee-pre-req
-  - apigee-bootstrap
-
-- hosts: '{{ hosts }}'
-  strategy: free
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-silent-installation-config
-  - apigee-opdk-setup-component-installer
-#  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
-  tags:
-  - apigee-pre-req
-  - apigee-installer
-
-- hosts: '{{ hosts }}'
   serial: 1
-  vars_files:
-  - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-default-settings
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
diff --git a/installations/dc1/components/opdk-pre-requisites.yml b/installations/dc1/components/opdk-pre-requisites.yml
new file mode 100644
index 0000000..9071b44
--- /dev/null
+++ b/installations/dc1/components/opdk-pre-requisites.yml
@@ -0,0 +1,53 @@
+---
+- hosts: '{{ hosts }}'
+  strategy: free
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-default-settings
+  - apigee-opdk-setup-apigee-user
+  tags:
+  - apigee-user
+  - apigee-pre-req
+
+- hosts: '{{ hosts }}'
+  strategy: free
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-os-limits
+#  - { role: apigee-fetch-files, fetch_files: '{{ system_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
+  tags:
+  - apigee-pre-req
+  - apigee-tuning
+
+- hosts: '{{ hosts }}'
+  strategy: free
+  roles:
+  - apigee-opdk-setup-openjdk
+  tags:
+  - apigee-pre-req
+  - openjdk
+
+- hosts: '{{ hosts }}'
+  strategy: free
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-default-settings
+  - apigee-opdk-setup-bootstrap
+  tags:
+  - apigee-pre-req
+  - apigee-bootstrap
+
+- hosts: '{{ hosts }}'
+  strategy: free
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-silent-installation-config
+  - apigee-opdk-setup-component-installer
+#  - { role: apigee-fetch-files, fetch_files: '{{ apigee_config_files }}', fetched_files_dir: '{{ fetched_configs_dir }}' }
+  tags:
+  - apigee-pre-req
+  - apigee-installer
diff --git a/installations/dc1/installation.yml b/installations/dc1/installation.yml
index 27d1713..33a8ff3 100644
--- a/installations/dc1/installation.yml
+++ b/installations/dc1/installation.yml
@@ -32,19 +32,25 @@
   tags:
   - root-user
 
-- include: components/opdk-install-component.yml
+- include: components/opdk-pre-requisites.yml
   vars:
     hosts: 'dc-1-ds'
     component_profile: 'ds'
     jdk_version: '1.8'
   tags:
+  - apigee-pre-req
+
+- include: components/opdk-install-component.yml
+  vars:
+    hosts: 'dc-1-ds'
+    component_profile: 'ds'
+  tags:
   - ds
 
 - include: components/opdk-install-component.yml
   vars:
     hosts: 'dc-1-ms'
     component_profile: 'ms'
-    jdk_version: '1.8'
   tags:
   - ms
 
@@ -59,7 +65,6 @@
   vars:
     hosts: 'dc-1-rmp'
     component_profile: 'rmp'
-    jdk_version: '1.8'
   tags:
   - rmp
 
@@ -74,7 +79,6 @@
   vars:
     hosts: 'dc-1-qpid'
     component_profile: 'qs'
-    jdk_version: '1.8'
   tags:
   - qpid
 
@@ -82,7 +86,6 @@
   vars:
     hosts: 'dc-1-pgmaster'
     pg_component: 'master'
-    jdk_version: '1.8'
   tags:
   - pgmaster
 
@@ -90,7 +93,6 @@
   vars:
     hosts: 'dc-1-pgstandby'
     pg_component: 'standby'
-    jdk_version: '1.8'
   tags:
   - pgstandby