diff --git a/smartgears/dataminer_app/tasks/dataminer-app.yml b/smartgears/dataminer_app/tasks/dataminer-app.yml
index 3af09cad..88329bed 100644
--- a/smartgears/dataminer_app/tasks/dataminer-app.yml
+++ b/smartgears/dataminer_app/tasks/dataminer-app.yml
@@ -28,10 +28,13 @@
       become_user: "{{ d4science_ansible_become_user | default('root') }}"
       template: src=wps-config-fixer.j2 dest=/usr/local/bin/wps-config-fixer owner=root group=root mode=0555
       with_items: '{{ tomcat_m_instances }}'
+      tags: [ 'tomcat', 'dataminer', 'wps', 'wps_config' ]
 
     - name: Fix the WPS config file
       shell: /usr/local/bin/wps-config-fixer
-#      notify: Restart smartgears
+      notify: Restart smartgears
+      when: dataminer_force_restart is defined and dataminer_force_restart
+      tags: [ 'tomcat', 'dataminer', 'wps', 'wps_config' ]
 
     - name: Remove the file that lists the installed algorithms, after an upgrade
       file: dest={{ smartgears_user_home }}/wps_algorithms_install_log/already_installed_algorithms.txt state=absent