diff --git a/roles/custom/matrix-element-admin/defaults/main.yml b/roles/custom/matrix-element-admin/defaults/main.yml
index 6cfff7df1..a15d80a70 100644
--- a/roles/custom/matrix-element-admin/defaults/main.yml
+++ b/roles/custom/matrix-element-admin/defaults/main.yml
@@ -31,7 +31,6 @@ matrix_element_admin_container_src_path: "{{ matrix_element_admin_base_path }}/c
 
 matrix_element_admin_container_image: "{{ matrix_element_admin_container_image_registry_prefix }}element-admin:{{ matrix_element_admin_container_image_tag }}"
 matrix_element_admin_container_image_tag: "{{ matrix_element_admin_version }}"
-matrix_element_admin_container_image_force_pull: "{{ matrix_element_admin_container_image.endswith(':main') }}"
 matrix_element_admin_container_image_registry_prefix: "{{ matrix_element_admin_container_image_registry_prefix_upstream }}"
 matrix_element_admin_container_image_registry_prefix_upstream: "{{ matrix_element_admin_container_image_registry_prefix_upstream_default }}"
 matrix_element_admin_container_image_registry_prefix_upstream_default: "oci.element.io/"
diff --git a/roles/custom/matrix-element-admin/tasks/install.yml b/roles/custom/matrix-element-admin/tasks/install.yml
index 5cf94471a..19e88dca0 100644
--- a/roles/custom/matrix-element-admin/tasks/install.yml
+++ b/roles/custom/matrix-element-admin/tasks/install.yml
@@ -32,11 +32,9 @@
   register: matrix_element_admin_support_files_result
 
 - name: Ensure Element Admin container image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_element_admin_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_element_admin_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_element_admin_container_image_force_pull }}"
+    pull: always
   when: "not matrix_element_admin_container_image_self_build | bool"
   register: matrix_element_admin_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
diff --git a/roles/custom/matrix-element-admin/tasks/validate_config.yml b/roles/custom/matrix-element-admin/tasks/validate_config.yml
index 72f01e1af..60ca49d11 100644
--- a/roles/custom/matrix-element-admin/tasks/validate_config.yml
+++ b/roles/custom/matrix-element-admin/tasks/validate_config.yml
@@ -24,3 +24,11 @@
       Element Admin with a path prefix other than '/' is not supported yet.
       You have configured matrix_element_admin_path_prefix to '{{ matrix_element_admin_path_prefix }}'.
   when: "matrix_element_admin_path_prefix != '/'"
+
+- name: (Deprecation) Catch and report renamed Element Admin 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_element_admin_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}