diff --git a/smartgears/spd_service/tasks/main.yml b/smartgears/spd_service/tasks/main.yml
index 96e93dc0..db1f51ec 100644
--- a/smartgears/spd_service/tasks/main.yml
+++ b/smartgears/spd_service/tasks/main.yml
@@ -1,18 +1,27 @@
 ---
 - block:
     - name: Remove the old spd files
-      file: path={{ smartgears_instance_path }}/webapps/{{ spd_service_name }} state=absent
-      when: spd_service_upgrade
+      file: path={{ item }} state=absent
+      with_items:
+        - '{{ smartgears_instance_path }}/webapps/{{ spd_service_name }}'
+        - '{{ smartgears_instance_path }}/webapps/{{ spd_service_name }}.{{ spd_extension }}'
 
-    # NOTE: Install as the smartgears user so we do not mess with the permissions
+  become: True
+  become_user: '{{ d4science_user }}'
+  when: not spd_service_install 
+  tags: [ 'smartgears', 'spd_service', 'tomcat' ]
+
+- block:
     - name: Get the spd-service 
-      maven_artifact: artifact_id={{ spd_service_name }} version={{ spd_service_version | default(omit) }} group_id={{ spd_group_id }} extension={{ spd_extension | default('war') }} repository_url={{ spd_service_repository_url }} dest={{ smartgears_user_home }}/{{ spd_service_file }}
+      maven_artifact: artifact_id={{ spd_service_name }} version={{ spd_service_version | default('latest') }} group_id={{ spd_group_id }} extension={{ spd_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ spd_service_file }}
+      register: spd_service_download
   
-    - name: Create the spd  working directory
-      file: path={{ smartgears_instance_path }}/webapps/{{ spd_service_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }}
-  
-    - name: Unarchive the spd  war
-      unarchive: copy=no src={{ smartgears_user_home }}/{{ spd_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ spd_service_name }} creates={{ smartgears_instance_path }}/webapps/{{ spd_service_name }}/WEB-INF/lib
+    - name: Remove the old spd files
+      file: path={{ smartgears_instance_path }}/webapps/{{ spd_service_name }} state=absent
+      when: ( spd_service_download | changed )
+
+    - name: Copy the spd war into the webapps directory
+      copy: src={{ smartgears_downloads_dir }}/{{ spd_service_file }} dest={{ smartgears_instance_path }}/webapps/{{ spd_service_name }}.{{ spd_extension }} remote_src=yes force=yes
       notify: Restart smartgears
 
   become: True
@@ -20,11 +29,3 @@
   when: spd_service_install 
   tags: [ 'smartgears', 'spd_service', 'tomcat' ]
 
-- block:
-    - name: Remove the old spd files
-      file: path={{ smartgears_instance_path }}/webapps/{{ spd_service_name }} state=absent
-
-  become: True
-  become_user: '{{ d4science_user }}'
-  when: not spd_service_install 
-  tags: [ 'smartgears', 'spd_service', 'tomcat' ]