diff --git a/tasks/install-mirror.yml b/tasks/install-mirror.yml
index e840d44..fc3c636 100644
--- a/tasks/install-mirror.yml
+++ b/tasks/install-mirror.yml
@@ -1,24 +1,24 @@
 ---
 - name: Install bootstrap from local repository for 4.16.01
-  shell: "bash {{ archive_folder }}/repos/bootstrap.sh apigeeprotocol='file://' apigeerepobasepath={{ archive_folder }}/repos JAVA_FIX=C"
+  shell: "bash {{ apigeerepobasepath }}/repos/bootstrap.sh apigeeprotocol='file://' apigeerepobasepath={{ apigeerepobasepath }}/repos JAVA_FIX=C"
   env:
     JAVA_HOME: '{{ java_home }}'
   when: opdk_version | version_compare('4.16.01', '==')
 
 - name: DEBUG_MODE - Install bootstrap from local repository for 4.16.01
-  shell: "bash -x {{ archive_folder }}/repos/bootstrap.sh apigeeprotocol='file://' apigeerepobasepath={{ archive_folder }}/repos JAVA_FIX=C"
+  shell: "bash -x {{ apigeerepobasepath }}/repos/bootstrap.sh apigeeprotocol='file://' apigeerepobasepath={{ apigeerepobasepath }}/repos JAVA_FIX=C"
   env:
     JAVA_HOME: '{{ java_home }}'
   when: opdk_version | version_compare('4.16.01', '==') and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
 
 - name: Install bootstrap from local repository for greater than 4.16.01
-  shell: "bash {{ archive_folder }}/repos/bootstrap_{{ opdk_version }}.sh apigeeprotocol='file://' apigeerepobasepath={{ archive_folder }}/repos JAVA_FIX=C"
+  shell: "bash {{ apigeerepobasepath }}/repos/bootstrap_{{ opdk_version }}.sh apigeeprotocol='file://' apigeerepobasepath={{ apigeerepobasepath }}/repos JAVA_FIX=C"
   env:
     JAVA_HOME: '{{ java_home }}'
   when: opdk_version | version_compare('4.16.01', '>')
 
 - name: DEBUG_MODE - Install bootstrap from local repository for greater than 4.16.01
-  shell: "bash -x {{ archive_folder }}/repos/bootstrap_{{ opdk_version }}.sh apigeeprotocol='file://' apigeerepobasepath={{ archive_folder }}/repos JAVA_FIX=C"
+  shell: "bash -x {{ apigeerepobasepath }}/repos/bootstrap_{{ opdk_version }}.sh apigeeprotocol='file://' apigeerepobasepath={{ apigeerepobasepath }}/repos JAVA_FIX=C"
   env:
     JAVA_HOME: '{{ java_home }}'
   when: opdk_version | version_compare('4.16.01', '>') and opdk_debug_mode is defined and opdk_debug_mode | trim | lower == 'on'
diff --git a/tasks/main.yml b/tasks/main.yml
index 61c1dbe..dd75432 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -25,10 +25,10 @@
 #  when: opdk_version | version_compare('4.17.01', '>=')
 
 - include_tasks: install-online.yml
-  when: archive_folder is not defined
+  when: apigeerepobasepath is not defined
 
 - include_tasks: install-mirror.yml
-  when: archive_folder is defined and not archive_folder == ''
+  when: apigeerepobasepath is defined and not apigeerepobasepath == ''
 
 - name: Validate that apigee-service exists
   stat: