diff --git a/smartgears/dm_pool_manager/tasks/main.yml b/smartgears/dm_pool_manager/tasks/main.yml
index 3f06fda..1c05125 100644
--- a/smartgears/dm_pool_manager/tasks/main.yml
+++ b/smartgears/dm_pool_manager/tasks/main.yml
@@ -21,6 +21,17 @@
       file: path={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }} state=absent
       when: dm_pool_manager_download is changed
 
+    - name: Remove the work folder 
+      file: dest={{ smartgears_user_home }}/dataminer-pool-manager/work state=absent
+      file: dest={{ smartgears_user_home }}/dataminer-pool-manager/work state=directory
+      when: dm_pool_manager_download is changed
+
+    - name: Remove the job folder          
+      file: dest={{ smartgears_user_home }}/dataminer-pool-manager/jobs state=absent
+      file: dest={{ smartgears_user_home }}/dataminer-pool-manager/jobs state=directory
+      when: dm_pool_manager_download is changed
+
+
     - name: Create the dm_pool_manager working directory
       file: path={{ smartgears_instance_path }}/webapps/{{ dm_pool_manager_name }} state=directory owner={{ smartgears_user }} group={{ smartgears_user }}