diff --git a/smartgears/gcube-oauth/defaults/main.yml b/smartgears/gcube-oauth/defaults/main.yml
index 3d609087..6105dad8 100644
--- a/smartgears/gcube-oauth/defaults/main.yml
+++ b/smartgears/gcube-oauth/defaults/main.yml
@@ -5,5 +5,4 @@ gcube_oauth_name: oauth
 gcube_oauth_group_id: org.gcube.portal
 gcube_oauth_extension: war
 gcube_oauth_file: '{{ gcube_oauth_name }}-{{ gcube_oauth_version }}.{{ gcube_oauth_extension }}'
-gcube_oauth_repository_url: 'http://maven.research-infrastructures.eu/nexus/content/repositories/{{ gcube_repository }}'
 
diff --git a/smartgears/gcube-oauth/tasks/main.yml b/smartgears/gcube-oauth/tasks/main.yml
index 307c28c0..4eaa112d 100644
--- a/smartgears/gcube-oauth/tasks/main.yml
+++ b/smartgears/gcube-oauth/tasks/main.yml
@@ -5,19 +5,15 @@
 
   become: True
   become_user: '{{ d4science_user }}'
-  when: ( not gcube_oauth_install ) or ( smartgears_upgrade ) 
+  when: not gcube_oauth_install
   tags: [ 'smartgears', 'gcube_oauth', 'tomcat' ]
   
 - block:
-    # NOTE: Install as the smartgears user so we do not mess with the permissions
     - name: Get the gcube-oauth war
-      maven_artifact: artifact_id={{ gcube_oauth_name }} version={{ gcube_oauth_version | default(omit) }} group_id={{ gcube_oauth_group_id }} extension={{ gcube_oauth_extension | default('war') }} repository_url={{ gcube_oauth_repository_url }} dest={{ smartgears_user_home }}/{{ gcube_oauth_file }}
+      maven_artifact: artifact_id={{ gcube_oauth_name }} version={{ gcube_oauth_version | default(omit) }} group_id={{ gcube_oauth_group_id }} extension={{ gcube_oauth_extension | default('war') }} repository_url={{ smartgears_global_base_url }} dest={{ smartgears_downloads_dir }}/{{ gcube_oauth_file }}
   
-    - name: Create the gcube-oauth working directory
-      file: path={{ smartgears_instance_path }}/webapps/gcube-{{ gcube_oauth_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }}
-  
-    - name: Unarchive the gcube_oauth war
-      unarchive: copy=no src={{ smartgears_user_home }}/{{ gcube_oauth_file }} dest={{ smartgears_instance_path }}/webapps/gcube-{{ gcube_oauth_name }} creates={{ smartgears_instance_path }}/webapps/{{ gcube_oauth_name }}/WEB-INF/lib
+    - name: Copy the gcube_oauth war into the webapps directory
+      copy: src={{ smartgears_downloads_dir }}/{{ gcube_oauth_file }} dest={{ smartgears_instance_path }}/webapps/gcube-{{ gcube_oauth_name }}.{{ gcube_oauth_extension }}
       notify: Restart smartgears
 
   become: True