diff --git a/roles/custom/matrix-cactus-comments-client/defaults/main.yml b/roles/custom/matrix-cactus-comments-client/defaults/main.yml
index 8809a3aca..bea9b9701 100644
--- a/roles/custom/matrix-cactus-comments-client/defaults/main.yml
+++ b/roles/custom/matrix-cactus-comments-client/defaults/main.yml
@@ -25,7 +25,6 @@ matrix_cactus_comments_client_container_image_registry_prefix: "{{ matrix_cactus
 matrix_cactus_comments_client_container_image_registry_prefix_upstream: "{{ matrix_cactus_comments_client_container_image_registry_prefix_upstream_default }}"
 matrix_cactus_comments_client_container_image_registry_prefix_upstream_default: docker.io/
 matrix_cactus_comments_client_container_image_tag: "{{ 'latest' if matrix_cactus_comments_client_version == 'latest' else (matrix_cactus_comments_client_version + '-alpine') }}"
-matrix_cactus_comments_client_container_image_force_pull: "{{ matrix_cactus_comments_client_container_image.endswith(':latest') }}"
 
 matrix_cactus_comments_client_container_network: ""
 
diff --git a/roles/custom/matrix-cactus-comments-client/tasks/install.yml b/roles/custom/matrix-cactus-comments-client/tasks/install.yml
index fd2975577..0e4e661e1 100644
--- a/roles/custom/matrix-cactus-comments-client/tasks/install.yml
+++ b/roles/custom/matrix-cactus-comments-client/tasks/install.yml
@@ -67,11 +67,9 @@
         group: "{{ matrix_group_name }}"
 
 - name: Ensure matrix-cactus-comments-client container image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_cactus_comments_client_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_cactus_comments_client_container_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
-    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_cactus_comments_client_container_image_force_pull }}"
+    pull: always
   register: matrix_cactus_comments_client_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
   delay: "{{ devture_playbook_help_container_retries_delay }}"
diff --git a/roles/custom/matrix-cactus-comments-client/tasks/validate_config.yml b/roles/custom/matrix-cactus-comments-client/tasks/validate_config.yml
index b76cc963a..fccf2edd7 100644
--- a/roles/custom/matrix-cactus-comments-client/tasks/validate_config.yml
+++ b/roles/custom/matrix-cactus-comments-client/tasks/validate_config.yml
@@ -13,3 +13,11 @@
     - matrix_cactus_comments_client_hostname
     - matrix_cactus_comments_client_path_prefix
     - matrix_cactus_comments_client_container_network
+
+- name: (Deprecation) Catch and report renamed matrix-cactus-comments-client variables
+  ansible.builtin.fail:
+    msg: >-
+      The variable `{{ item.old }}` is deprecated. Please use `{{ item.new }}` instead.
+  when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
+  with_items:
+    - {'old': 'matrix_cactus_comments_client_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}