diff --git a/defaults/main.yml b/defaults/main.yml
index cc6f533..f31e2db 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,4 @@
 ---
-# defaults file for apigee-opdk-setup-default-settings
-credentials_file: '~/.apigee/credentials.yml'
-
 # Target Java JDK version
 jdk_version: '1.8'
 
@@ -32,7 +29,7 @@
 admin_pass: '{{ opdk_user_pass }}'
 
 # Default Apigee Edge Private Cloud Version
-opdk_version: '4.17.01'
+opdk_version: '4.17.09'
 
 # Default version of the Apigee mirror to use
 apigee_mirror_version: '{{ opdk_version }}'
@@ -83,8 +80,14 @@
 # Local resource location
 local_apigee_path: ~/.apigee
 
+# Local secure resource location
+local_apigee_secure: ~/.apigee-secure
+
+# defaults file for apigee-opdk-setup-default-settings
+credentials_file: '{{ local_apigee_secure }}/credentials.yml'
+
 # Apigee license file provided by customer
-opdk_license_source_file_name: '~/.apigee-secure/license.txt'
+opdk_license_source_file_name: '{{ local_apigee_secure }}/license.txt'
 
 # Apigee silent installation configuration file
 opdk_installation_config_file: "{{ opdk_installer_path }}/edge-response.conf"
diff --git a/tasks/update_cache.yml b/tasks/update_cache.yml
index cb8f734..a02b676 100644
--- a/tasks/update_cache.yml
+++ b/tasks/update_cache.yml
@@ -1,10 +1,4 @@
 ---
-- name: Update cache with apigeerepobasepath if provided
-  cache:
-    key: 'apigeerepobasepath'
-    value: '{{ apigeerepobasepath }}'
-  when: apigeerepobasepath is defined
-
 - name: Update cache with provided_response_file if provided
   cache:
     key: 'provided_response_file'
@@ -17,6 +11,7 @@
     value: "{{ item.value }}"
   with_items:
   - { key: "jdk_version", value: "{{ jdk_version }}" }
+  - { key: "apigeerepobasepath", value: "{{ apigeerepobasepath }}" }
   - { key: 'java_home', value: '{{ java_home }}' }
   - { key: 'opdk_user_name', value: '{{ opdk_user_name }}' }
   - { key: 'opdk_group_name', value: '{{ opdk_group_name }}' }
@@ -117,4 +112,5 @@
   - { key: 'opdk_bind_on_all_interfaces', value: '{{ opdk_bind_on_all_interfaces }}' }
   - { key: 'opdk_smtp_mail_from', value: '{{ opdk_smtp_mail_from }}' }
   - { key: 'enable_system_check', value: '{{ enable_system_check }}' }
+  - { key: 'local_apigee_secure', value: '{{ local_apigee_secure }}' }