diff --git a/roles/matrix_synapse/tasks/cleanup.yml b/roles/matrix_synapse/tasks/cleanup.yml
index 410af10..e24ae76 100644
--- a/roles/matrix_synapse/tasks/cleanup.yml
+++ b/roles/matrix_synapse/tasks/cleanup.yml
@@ -1,12 +1,15 @@
 ---
 
 - name: Remove unused and tmp files
-  file: path={{ synapse_root_dir }}/{{ item }} state=absent
+  file: path={{ item }} state=absent
   loop:
-    - lib
-    - lib64
-    - include
-    - bin
-    - db_dumps
+    - "{{ synapse_root_dir }}/lib"
+    - "{{ synapse_root_dir }}/lib64"
+    - "{{ synapse_root_dir }}/include"
+    - "{{ synapse_root_dir }}/bin"
+    - "{{ synapse_root_dir }}/db_dumps"
+    - "{{ synapse_root_dir }}/res/synapse_janitor.sql"
+    - "{{ synapse_root_dir }}/venv/bin/synapse_janitor.sh"
+    - /etc/cron.d/matrix_synapse
   tags: matrix
 
diff --git a/roles/matrix_synapse/tasks/install.yml b/roles/matrix_synapse/tasks/install.yml
index f46090a..b1a4dd5 100644
--- a/roles/matrix_synapse/tasks/install.yml
+++ b/roles/matrix_synapse/tasks/install.yml
@@ -110,22 +110,3 @@
     - post
   tags: matrix
 
-- name: Install synapse_janitor.sql script
-  get_url:
-    url: https://raw.githubusercontent.com/xwiki-labs/synapse_scripts/master/synapse_janitor.sql
-    dest: "{{ synapse_root_dir }}/res/"
-  tags: matrix
-
-- name: Deploy janitor script
-  template: src=synapse_janitor.sh.j2 dest={{ synapse_root_dir }}/venv/bin/synapse_janitor.sh mode=700
-  tags: matrix
-
-- name: Setup cron job to clean synapse database
-  cron:
-    name: matrix_synapse_janitor
-    special_time: weekly
-    user: root
-    job: '{{ synapse_root_dir }}/venv/bin/synapse_janitor.sh | /bin/systemd-cat'
-    cron_file: matrix_synapse
-  tags: matrix
-