diff --git a/components/opdk-upgrade-component.yml b/components/opdk-upgrade-component.yml
index 4a2b05b..dd5d0b7 100644
--- a/components/opdk-upgrade-component.yml
+++ b/components/opdk-upgrade-component.yml
@@ -1,8 +1,11 @@
 ---
-
 - hosts: '{{ hosts }}'
   vars:
     opdk_version: 4.16.09
+  vars_files:
+  - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
-  - { role: apigee-opdk-update-component, apigee_component: '{{ upgrade_component }}' }
\ No newline at end of file
+  - apigee-opdk-setup-bootstrap
+  - apigee-opdk-setup-component-installer
+#  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
+  - { role: apigee-opdk-update-component, apigee_component: '{{ upgrade_component }}' }
diff --git a/components/opdk-upgrade-reachability-component.yml b/components/opdk-upgrade-reachability-component.yml
index cd8e58a..a614150 100644
--- a/components/opdk-upgrade-reachability-component.yml
+++ b/components/opdk-upgrade-reachability-component.yml
@@ -4,8 +4,12 @@
   - ~/.apigee/credentials.yml
   vars:
     opdk_version: 4.16.09
+  vars_files:
+  - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
-  - { role: apigee-opdk-set-reachable, reachable: False, server_type: '{{ server_type }}' }
+  - apigee-opdk-setup-bootstrap
+  - apigee-opdk-setup-component-installer
+  - { role: apigee-opdk-set-reachable, reachability: False, server_type: '{{ server_type_name }}' }
+#  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   - { role: apigee-opdk-update-component, apigee_component: '{{ upgrade_component }}' }
-  - { role: apigee-opdk-set-reachable, reachable: True, server_type: '{{ server_type }}' }
+  - { role: apigee-opdk-set-reachable, reachability: True, server_type: '{{ server_type_name }}' }
diff --git a/requirements.yml b/requirements.yml
new file mode 100644
index 0000000..a3c275e
--- /dev/null
+++ b/requirements.yml
@@ -0,0 +1,24 @@
+---
+- src: https://github.com/carlosfrias/apigee-opdk-setup-component-installer
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-default-settings
+
+- src: https://github.com/carlosfrias/apigee-opdk-set-reachable
+
+- src: https://github.com/carlosfrias/apigee-fetch-files
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-status
+
+- src: https://github.com/carlosfrias/apigee-opdk-start-component
+
+- src: https://github.com/carlosfrias/apigee-opdk-stop-components
+
+- src: https://github.com/carlosfrias/apigee-opdk-backup
+
+- src: https://github.com/carlosfrias/apigee-opdk-restore
+
+- src: https://github.com/carlosfrias/apigee-opdk-server-self
+
+- src: https://github.com/carlosfrias/apigee-opdk-update-component
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
diff --git a/upgrade.yml b/upgrade.yml
index 2ad1638..add4402 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -3,67 +3,48 @@
 
 - include: components/opdk-upgrade-component.yml
   vars:
-    hosts: ds[0]
-    upgrade_component: ds
+    hosts: ms
+    upgrade_component: ldap
 
 - include: components/opdk-upgrade-component.yml
   vars:
-    hosts: ms[0]
-    upgrade_component: ms
+    hosts: ds
+    upgrade_component: cs
+
+- include: components/opdk-upgrade-component.yml
+  vars:
+    hosts: ds
+    upgrade_component: zk
 
 - include: components/opdk-upgrade-reachability-component.yml
   vars:
-    hosts: rmp[0]
-    server_type: router
-    upgrade_component: r
+    hosts: qpid
+    server_type_name: qs
+    upgrade_component: qpid
 
-#- hosts: rmp
-#  tasks:
-#  - include: configuration/opdk-set-reachable.yml
-#    vars:
-#      hosts: '{{ inventory_hostname }}'
-#      reachability: 'false'
-#
-#  - include: components/opdk-upgrade-component.yml
-#    vars:
-#      hosts: '{{ inventory_hostname }}'
-#      upgrade_component: rmp
-#
-#  - include: configuration/opdk-set-reachable.yml
-#    vars:
-#      hosts: '{{ inventory_hostname }}'
-#      reachability: 'true'
-#
-#- hosts: qpid
-#  tasks:
-#  - include: configuration/opdk-set-reachable.yml
-#    vars:
-#      hosts: '{{ inventory_hostname }}'
-#      reachability: 'false'
-#
-#  - include: components/opdk-upgrade-component.yml
-#    vars:
-#      hosts: '{{ inventory_hostname }}'
-#      upgrade_component: qs
-#
-#  - include: configuration/opdk-set-reachable.yml
-#    vars:
-#      hosts: '{{ inventory_hostname }}'
-#      reachability: 'true'
-#
-#- hosts: pg
-#  tasks:
-#  - include: configuration/opdk-set-reachable.yml
-#    vars:
-#      hosts: '{{ inventory_hostname }}'
-#      reachability: 'false'
-#
-#  - include: components/opdk-upgrade-component.yml
-#    vars:
-#      hosts: '{{ inventory_hostname }}'
-#      upgrade_component: ps
-#
-#  - include: configuration/opdk-set-reachable.yml
-#    vars:
-#      hosts: '{{ inventory_hostname }}'
-#      reachability: 'true'
+- include: components/opdk-upgrade-reachability-component.yml
+  vars:
+    hosts: pg
+    server_type_name: ps
+    upgrade_component: edge
+
+- include: components/opdk-upgrade-component.yml
+  vars:
+    hosts: ds[0,2]
+    upgrade_component: edge
+
+- include: components/opdk-upgrade-component.yml
+  vars:
+    hosts: ms
+    upgrade_component: edge
+
+- include: components/opdk-upgrade-reachability-component.yml
+  vars:
+    hosts: rmp
+    server_type_name: router
+    upgrade_component: edge
+
+- include: components/opdk-upgrade-component.yml
+  vars:
+    hosts: ms
+    upgrade_component: ui