diff --git a/defaults/main.yml b/defaults/main.yml
index cda21a5..b48b053 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,6 +4,7 @@ orchestrator_create_image: "{{ global_create_image | default(false) }}"
 orchestrator_download_src: https://github.com/github/orchestrator/releases/download
 orchestrator_version: 3.0.10
 orchestrator_install_via_packagecloud: false
+orchestrator_upgrade: false
 orchestrator_upgrade_if_older_version: false
 orchestrator_is_server: true
 
diff --git a/tasks/install.yml b/tasks/install.yml
index b9c164a..fd34b8a 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -43,7 +43,7 @@
     file:
       path: "{{ orchestrator_installed_file }}"
       state: absent
-    when: orchestrator_upgrade_if_older_version
+    when: orchestrator_upgrade
 
   - name: orchestrator | install | download and unpack orchestrator
     unarchive:
diff --git a/vars/main.yml b/vars/main.yml
index 9a94f8e..925f1db 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -8,7 +8,7 @@ orchestrator_packages:
   - orchestrator
   - orchestrator-cli
 
-orchestrator_install_dir: "{{ orchestrator_home_dir }}/orchestrator-{{ orchestrator_version }}"
+orchestrator_install_dir: "{{ orchestrator_home_dir }}/orchestrator"
 
 orchestrator_src: "{{ orchestrator_download_src }}/v{{ orchestrator_version }}/orchestrator-{{ orchestrator_version }}-linux-amd64.tar.gz"