diff --git a/smartgears/accounting-service/tasks/main.yml b/smartgears/accounting-service/tasks/main.yml
index 3a0500fb..c423b274 100644
--- a/smartgears/accounting-service/tasks/main.yml
+++ b/smartgears/accounting-service/tasks/main.yml
@@ -1,18 +1,19 @@
 ---
 - block:
-    - name: Create the accounting-service working directory
-      file: path={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }}
-  
     - name: Get the accounting_service war
-      maven_artifact: artifact_id={{ accounting_service_name }} version={{ accounting_service_version | default('latest') }} group_id={{ accounting_service_group_id }} extension={{ accounting_service_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_user_home }}/{{ accounting_service_file }}
+      maven_artifact: artifact_id={{ accounting_service_name }} version={{ accounting_service_version | default('latest') }} group_id={{ accounting_service_group_id }} extension={{ accounting_service_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ accounting_service_file }}
       register: accounting_service_new_war
 
     - name: Remove the old accounting-service files
       file: path={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }} state=absent
       when: (accounting_service_new_war | changed)
 
+    - name: Create the accounting-service working directory
+      file: path={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }}
+      when: (accounting_service_new_war | changed)
+  
     - name: Unarchive the accounting service war
-      unarchive: copy=no src={{ smartgears_user_home }}/{{ accounting_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }} creates={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }}/WEB-INF/lib
+      unarchive: copy=no src={{ smartgears_downloads_dir }}/{{ accounting_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }} creates={{ smartgears_instance_path }}/webapps/{{ accounting_service_name }}/WEB-INF/lib
       notify: Restart smartgears
       
   become: True