diff --git a/smartgears/cmems_importer_se_plugin/tasks/main.yml b/smartgears/cmems_importer_se_plugin/tasks/main.yml
index 20334389..cb0e2acf 100644
--- a/smartgears/cmems_importer_se_plugin/tasks/main.yml
+++ b/smartgears/cmems_importer_se_plugin/tasks/main.yml
@@ -1,11 +1,28 @@
 ---
 - block:
     - name: Remove the old cmems-importer plugin
-      shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/cmems-importer-se-plugin-*-jar-with-dependencies.jar
-      when: cmems_importer_se_plugin_upgrade
+      shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ cmems_importer_se_plugin_name }}-*-{{ cmems_importer_se_plugin_classifier }}.{{ cmems_importer_se_plugin_extension }}
+      notify: Restart smartgears
     
-    - name: Install the cmems-importer plugin inside the smart executor lib directory
-      maven_artifact: artifact_id={{ cmems_importer_se_plugin_name }} version={{ cmems_importer_se_plugin_version | default(omit) }} group_id={{ cmems_importer_se_plugin_group_id }} extension={{ cmems_importer_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ cmems_importer_se_plugin_classifier }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ cmems_importer_se_plugin_file }}
+  become: True
+  become_user: '{{ smartgears_user }}'
+  when: not cmems_importer_se_plugin_install
+  tags: [ 'smartgears', 'cmems_importer_se', 'tomcat' ]
+
+
+- block:
+    - name: Download the cmems-importer plugin
+      maven_artifact: artifact_id={{ cmems_importer_se_plugin_name }} version={{ cmems_importer_se_plugin_version | default('latest') }} group_id={{ cmems_importer_se_plugin_group_id }} extension={{ cmems_importer_se_plugin_extension }} repository_url={{ smartgears_global_base_url }} classifier={{ cmems_importer_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ cmems_importer_se_plugin_file }}
+      register: cmems_importer_download
+
+    - name: Remove the old cmems-importer plugin
+      shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ cmems_importer_se_plugin_name }}-*-{{ cmems_importer_se_plugin_classifier }}.{{ cmems_importer_se_plugin_extension }}
+      when: ( cmems_importer_download | changed )
+      notify: Restart smartgears
+
+    - name: Copy the cmems-importer plugin on the correct place
+      copy: src={{ smartgears_downloads_dir }}/{{ cmems_importer_se_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ cmems_importer_se_plugin_file }} remote_src=yes force=yes
+      when: ( cmems_importer_download | changed )
       notify: Restart smartgears
  
     - name: Install the nco package
diff --git a/smartgears/oscar_importer_se_plugin/tasks/main.yml b/smartgears/oscar_importer_se_plugin/tasks/main.yml
index b8df5a17..7b39d927 100644
--- a/smartgears/oscar_importer_se_plugin/tasks/main.yml
+++ b/smartgears/oscar_importer_se_plugin/tasks/main.yml
@@ -1,13 +1,29 @@
 ---
 - block:
     - name: Remove the old oscar-importer plugin
-      shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/oscar-importer-se-plugin-*-jar-with-dependencies.jar
-      when: oscar_importer_se_plugin_upgrade
-    
-    - name: Install the oscar-importer plugin inside the smart executor lib directory
-      maven_artifact: artifact_id={{ oscar_importer_se_plugin_name }} version={{ oscar_importer_se_plugin_version | default(omit) }} group_id={{ oscar_importer_se_plugin_group_id }} extension={{ oscar_importer_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ oscar_importer_se_plugin_classifier }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ oscar_importer_se_plugin_file }}
+      shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ oscar_importer_se_plugin_name }}-*-{{ oscar_importer_se_plugin_classifier }}.{{ oscar_importer_se_plugin_extension }}
       notify: Restart smartgears
- 
+    
+  become: True
+  become_user: '{{ smartgears_user }}'
+  when: not oscar_importer_se_plugin_install
+  tags: [ 'smartgears', 'oscar_importer_se', 'tomcat' ]
+
+- block:
+    - name: Install the oscar-importer plugin inside the smart executor lib directory
+      maven_artifact: artifact_id={{ oscar_importer_se_plugin_name }} version={{ oscar_importer_se_plugin_version | default(omit) }} group_id={{ oscar_importer_se_plugin_group_id }} extension={{ oscar_importer_se_plugin_extension | default('war') }} repository_url={{ smartgears_global_base_url }} classifier={{ oscar_importer_se_plugin_classifier }} dest={{ smartgears_downloads_dir }}/{{ oscar_importer_se_plugin_file }}
+      register: oscar_importer_download
+
+    - name: Remove the old oscar-importer plugin
+      shell: rm -f {{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ oscar_importer_se_plugin_name }}-*-{{ oscar_importer_se_plugin_classifier }}.{{ oscar_importer_se_plugin_extension }}
+      when: ( oscar_importer_download | changed )
+      notify: Restart smartgears
+
+    - name: Copy the oscar-importer plugin on the correct place
+      copy: src={{ smartgears_downloads_dir }}/{{ oscar_importer_se_plugin_file }} dest={{ smartgears_instance_path }}/webapps/{{ smart_executor_name }}/WEB-INF/lib/{{ oscar_importer_se_plugin_file }} remote_src=yes force=yes
+      when: ( oscar_importer_download | changed )
+      notify: Restart smartgears
+
     - name: Install the libnetcdfc7 package
       become_user: root
       apt: pkg=libnetcdfc7 state=present update_cache=yes cache_valid_time=1800