diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 87b1b2c188b99e4e6afc176b2135a68dc5cfc820..451c32edb6a035e896fce5d5634c249696a73e47 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -214,12 +214,11 @@
   when: deploy_ca_certificates_result.changed
   changed_when: true  # Always results in change due to task logic.
 
-- name: Set-up file diversions for custom files that overrride package-provided ones
-  ansible.builtin.command: "dpkg-divert --divert '{{ item }}.original' --rename '{{ item }}'"
-  register: "dpkg_divert"
-  changed_when: "'Adding' in dpkg_divert.stdout"
-  with_items:
-    - "/usr/sbin/ferm"
+- name: Set-up file diversion for custom ferm binary
+  community.general.dpkg_divert:
+    path: "/usr/sbin/ferm"
+    divert: "/usr/sbin/ferm.original"
+    rename: true
   notify:
     - Restart ferm