diff --git a/roles/custom/matrix-bot-mjolnir/defaults/main.yml b/roles/custom/matrix-bot-mjolnir/defaults/main.yml
index 64e100454..badd5e907 100644
--- a/roles/custom/matrix-bot-mjolnir/defaults/main.yml
+++ b/roles/custom/matrix-bot-mjolnir/defaults/main.yml
@@ -26,7 +26,6 @@ matrix_bot_mjolnir_container_image: "{{ matrix_bot_mjolnir_container_image_regis
 matrix_bot_mjolnir_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_mjolnir_container_image_self_build else matrix_bot_mjolnir_container_image_registry_prefix_upstream }}"
 matrix_bot_mjolnir_container_image_registry_prefix_upstream: "{{ matrix_bot_mjolnir_container_image_registry_prefix_upstream_default }}"
 matrix_bot_mjolnir_container_image_registry_prefix_upstream_default: "docker.io/"
-matrix_bot_mjolnir_container_image_force_pull: "{{ matrix_bot_mjolnir_container_image.endswith(':latest') }}"
 
 matrix_bot_mjolnir_base_path: "{{ matrix_base_data_path }}/mjolnir"
 matrix_bot_mjolnir_config_path: "{{ matrix_bot_mjolnir_base_path }}/config"
diff --git a/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml b/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml
index 5ccf00a7d..2d8a367aa 100644
--- a/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml
+++ b/roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml
@@ -28,11 +28,9 @@
   when: "item.when | bool"
 
 - name: Ensure mjolnir Docker image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_bot_mjolnir_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_bot_mjolnir_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_bot_mjolnir_container_image_force_pull }}"
+    pull: always
   when: "not matrix_bot_mjolnir_container_image_self_build | bool"
   register: matrix_bot_mjolnir_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -51,15 +49,14 @@
   when: "matrix_bot_mjolnir_container_image_self_build | bool"
 
 - name: Ensure mjolnir Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_bot_mjolnir_container_image }}"
-    source: build
-    force_source: "{{ matrix_bot_mjolnir_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_bot_mjolnir_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_bot_mjolnir_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_bot_mjolnir_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_bot_mjolnir_container_image_self_build | bool"
+  register: matrix_bot_mjolnir_container_image_build_result
 
 - name: Ensure matrix-bot-mjolnir config installed
   ansible.builtin.copy:
@@ -92,6 +89,7 @@
         or matrix_bot_mjolnir_config_result.changed | default(false)
         or matrix_bot_mjolnir_systemd_service_result.changed | default(false)
         or matrix_bot_mjolnir_container_image_pull_result.changed | default(false)
+        or matrix_bot_mjolnir_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-bot-mjolnir.service restarted, if necessary
diff --git a/roles/custom/matrix-bot-mjolnir/tasks/validate_config.yml b/roles/custom/matrix-bot-mjolnir/tasks/validate_config.yml
index 66f582a18..53f6b1850 100644
--- a/roles/custom/matrix-bot-mjolnir/tasks/validate_config.yml
+++ b/roles/custom/matrix-bot-mjolnir/tasks/validate_config.yml
@@ -17,6 +17,7 @@
     - {'old': 'matrix_bot_mjolnir_container_image_name_prefix', 'new': 'matrix_bot_mjolnir_container_image_registry_prefix'}
     - {'old': 'matrix_bot_mjolnir_docker_image', 'new': 'matrix_bot_mjolnir_container_image'}
     - {'old': 'matrix_bot_mjolnir_docker_image_force_pull', 'new': 'matrix_bot_mjolnir_container_image_force_pull'}
+    - {'old': 'matrix_bot_mjolnir_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
     - {'old': 'matrix_bot_mjolnir_docker_image_registry_prefix', 'new': 'matrix_bot_mjolnir_container_image_registry_prefix'}
     - {'old': 'matrix_bot_mjolnir_docker_image_registry_prefix_upstream', 'new': 'matrix_bot_mjolnir_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_bot_mjolnir_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bot_mjolnir_container_image_registry_prefix_upstream_default'}