diff --git a/defaults/main.yml b/defaults/main.yml
index 8467933..c6044c0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -102,10 +102,10 @@
 apigee_validate_config_file: '{{ opdk_installer_path }}/apigee-validate.conf'
 
 # Apigee bootstrap download user name
-apigee_repo_user: '{{ opdk_user_name }}'
+default_apigee_repo_user: '{{ opdk_user_name }}'
 
 # Apigee bootstra download user name password
-apigee_repo_password: ''
+default_apigee_repo_password: ''
 
 # Apigee bootstrap download uri
 default_apigee_repo_uri: 'software.apigee.com'
diff --git a/tasks/update_cache.yml b/tasks/update_cache.yml
index cd2b9a3..86589fa 100644
--- a/tasks/update_cache.yml
+++ b/tasks/update_cache.yml
@@ -45,8 +45,8 @@
   - { key: 'opdk_installation_config_file', value: "{{ opdk_installation_config_file }}" }
   - { key: 'apigee_postgresql_data_dir', value: "{{ apigee_postgresql_data_dir }}" }
   - { key: 'apigee_validate_config_file', value: "{{ apigee_validate_config_file }}" }
-  - { key: 'apigee_repo_user', value: '{{ apigee_repo_user }}' }
-  - { key: 'apigee_repo_password', value: '{{ apigee_repo_password }}' }
+  - { key: 'default_apigee_repo_user', value: '{{ apigee_repo_user }}' }
+  - { key: 'default_apigee_repo_password', value: '{{ apigee_repo_password }}' }
   - { key: 'default_apigee_repo_uri', value: '{{ default_apigee_repo_uri }}' }
   - { key: 'default_apigee_repo_protocol', value: '{{ default_apigee_repo_protocol }}' }
   - { key: 'default_apigee_repo_url', value: '{{ default_apigee_repo_url }}' }