diff --git a/odroid.yaml b/odroid.yaml
index 3bd58da..f71a814 100644
--- a/odroid.yaml
+++ b/odroid.yaml
@@ -107,14 +107,14 @@
         remote_src: true
         src: "{{ backup_dir }}/{{ item }}/"
         dest: "{{ backup_dir }}/{{ item }}/daily/"
-      loop: "{{ databases }}"
+      loop: "{{ systems }}"
       when: (ansible_date_time.weekday_number != "7" and ansible_date_time.day != "01")
       
     - name: Cleanup original backup files
       file:
-        path: "{{ backup_dir }}/{{ item }}/{{ ansible_date_time.iso8601_basic_short }}.sql.gz"
+        path: "{{ backup_dir }}/{{ item }}/*"
         state: absent
-      loop: "{{ databases }}"
+      loop: "{{ systems }}"
 
     - name: Find old daily backups
       find: