diff --git a/tasks/main.yml b/tasks/main.yml
index ccbc765..d9f037f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,13 +3,13 @@
 #- name: Clean up any old repos
 #  become: true
 #  file:
-#    path: '{{ apigeerepobasepath }}/repos'
+#    path: '{{ apigeerepobasepath | default(opdk_installer_path) }}/repos'
 #    state: absent
 
 - name: Ensure repo folders exists
   become: true
   file:
-    path: '{{ apigeerepobasepath }}/repos'
+    path: '{{ apigeerepobasepath | default(opdk_installer_path) }}/repos'
     state: directory
     owner: "{{ opdk_user_name }}"
     group: "{{ opdk_group_name }}"
@@ -26,7 +26,7 @@
       owner: "{{ opdk_user_name }}"
       group: "{{ opdk_group_name }}"
       src: "{{ local_apigee_path }}/{{ apigee_archive_name }}"
-      dest: "{{ apigeerepobasepath }}/{{ apigee_archive_name }}"
+      dest: "{{ apigeerepobasepath | default(opdk_installer_path) }}/{{ apigee_archive_name }}"
       rsync_opts: ['--partial-dir={{ opdk_installer_path }}']
 #    register: results
 #    failed_when: "'sudo: sorry, you must have a tty to run sudo' in results.stderr"
@@ -47,7 +47,7 @@
         owner: "{{ opdk_user_name }}"
         group: "{{ opdk_group_name }}"
         src: "{{ local_apigee_path }}/{{ apigee_archive_name }}"
-        dest: "{{ apigeerepobasepath }}/{{ apigee_archive_name }}"
+        dest: "{{ apigeerepobasepath | default(opdk_installer_path) }}/{{ apigee_archive_name }}"
         rsync_opts: ['--partial-dir={{ opdk_installer_path }}']
 
     - name: Restore tty modified temporarily
@@ -65,8 +65,8 @@
 - name: Unarchive on target node
   become: true
   unarchive:
-    src: '{{ apigeerepobasepath }}/{{ apigee_archive_name }}'
-    dest: '{{ apigeerepobasepath }}'
+    src: '{{ apigeerepobasepath | default(opdk_installer_path) }}/{{ apigee_archive_name }}'
+    dest: '{{ apigeerepobasepath | default(opdk_installer_path) }}'
     copy: false
     owner: "{{ opdk_user_name }}"
     group: "{{ opdk_group_name }}"