diff --git a/roles/matrix-synapse/tasks/workers/setup_install.yml b/roles/matrix-synapse/tasks/workers/setup_install.yml
index 9aa0c4ec9..6cd7ae42c 100644
--- a/roles/matrix-synapse/tasks/workers/setup_install.yml
+++ b/roles/matrix-synapse/tasks/workers/setup_install.yml
@@ -46,12 +46,18 @@
     enabled: true
   with_items: "{{ matrix_synapse_workers_enabled_list }}"
 
+- name: Find worker configs to be cleaned
+  find:
+    path: "{{ matrix_synapse_config_dir_path }}"
+    patterns: "worker.*.yaml"
+    use_regex: true
+  register: worker_config_files
+
 - name: Ensure previous worker configs are cleaned
   file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: absent
-  with_fileglob:
-    - "{{ matrix_synapse_config_dir_path }}/worker.*.yaml"
+  with_items: "{{ worker_config_files.files }}"
 
 - name: Ensure creation of specific worker configs
   template:
diff --git a/roles/matrix-synapse/tasks/workers/setup_uninstall.yml b/roles/matrix-synapse/tasks/workers/setup_uninstall.yml
index 879e69984..a9884fcab 100644
--- a/roles/matrix-synapse/tasks/workers/setup_uninstall.yml
+++ b/roles/matrix-synapse/tasks/workers/setup_uninstall.yml
@@ -25,12 +25,18 @@
     state: absent
   register: matrix_synapse_worker_systemd_service_result
 
+- name: Find worker configs to be cleaned
+  find:
+    path: "{{ matrix_synapse_config_dir_path }}"
+    patterns: "worker.*.yaml"
+    use_regex: true
+  register: worker_config_files
+
 - name: Ensure worker configs are cleaned
   file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
     state: absent
-  with_fileglob:
-    - "{{ matrix_synapse_config_dir_path }}/worker.*.yaml"
+  with_items: "{{ worker_config_files.files }}"
 
 - name: Remove workers from synapse.wants list
   set_fact: