diff --git a/components/opdk-install-component.yml b/components/opdk-install-component.yml
index bdac10a..2c3151e 100644
--- a/components/opdk-install-component.yml
+++ b/components/opdk-install-component.yml
@@ -3,6 +3,7 @@
   serial: 1
   gather_facts: no
   roles:
+  - apigee-opdk-setup-java-home
   - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   tags:
diff --git a/components/opdk-upgrade-component.yml b/components/opdk-upgrade-component.yml
index f9eb1fe..0362ef2 100644
--- a/components/opdk-upgrade-component.yml
+++ b/components/opdk-upgrade-component.yml
@@ -16,7 +16,6 @@
       destination_port: '{{ block_port }}',
       when: block_port is defined
     }
-
   - {
       role: apigee-opdk-update-component,
       apigee_component: '{{ upgrade_component }}'
diff --git a/requirements.yml b/requirements.yml
index bba90da..6638037 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -30,3 +30,5 @@
 - src: https://github.com/carlosfrias/apigee-opdk-iptables-port-block
 
 - src: https://github.com/carlosfrias/apigee-opdk-cache-update.git
+
+- src: https://github.com/carlosfrias/apigee-opdk-setup-java-home.git
diff --git a/upgrade.yml b/upgrade.yml
index 94e7fbe..1b84a9f 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -2,6 +2,7 @@
 - name: Update the ansible cache
   hosts: planet
   tags: ['cache']
+  gather_facts: no
   vars_files:
   - ~/.apigee/credentials.yml
   roles: