diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml
index a402c9083..a87914aac 100644
--- a/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml
+++ b/roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml
@@ -20,7 +20,6 @@ matrix_mautrix_bluesky_container_image: "{{ matrix_mautrix_bluesky_container_ima
 matrix_mautrix_bluesky_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_bluesky_container_image_self_build else matrix_mautrix_bluesky_container_image_registry_prefix_upstream }}"
 matrix_mautrix_bluesky_container_image_registry_prefix_upstream: "{{ matrix_mautrix_bluesky_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_bluesky_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_bluesky_container_image_force_pull: "{{ matrix_mautrix_bluesky_container_image.endswith(':latest') }}"
 
 matrix_mautrix_bluesky_base_path: "{{ matrix_base_data_path }}/mautrix-bluesky"
 matrix_mautrix_bluesky_config_path: "{{ matrix_mautrix_bluesky_base_path }}/config"
diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml
index ef45a0528..8c92ad6be 100644
--- a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml
+++ b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml
@@ -8,11 +8,9 @@
     matrix_mautrix_bluesky_migration_requires_restart: false
 
 - name: Ensure Mautrix Bluesky image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_bluesky_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_bluesky_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_mautrix_bluesky_container_image_force_pull }}"
+    pull: always
   when: matrix_mautrix_bluesky_enabled | bool and not matrix_mautrix_bluesky_container_image_self_build
   register: matrix_mautrix_bluesky_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -45,15 +43,14 @@
   when: "matrix_mautrix_bluesky_enabled | bool and matrix_mautrix_bluesky_container_image_self_build"
 
 - name: Ensure Mautrix Bluesky Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mautrix_bluesky_container_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_bluesky_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mautrix_bluesky_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mautrix_bluesky_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mautrix_bluesky_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mautrix_bluesky_enabled | bool and matrix_mautrix_bluesky_container_image_self_build | bool"
+  register: matrix_mautrix_bluesky_container_image_build_result
 
 - name: Ensure mautrix-bluesky config.yaml installed
   ansible.builtin.copy:
@@ -108,6 +105,7 @@
         or matrix_mautrix_bluesky_support_files_result.changed | default(false)
         or matrix_mautrix_bluesky_systemd_service_result.changed | default(false)
         or matrix_mautrix_bluesky_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_bluesky_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mautrix-bluesky.service restarted, if necessary
diff --git a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/validate_config.yml b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/validate_config.yml
index c1e383521..781494642 100644
--- a/roles/custom/matrix-bridge-mautrix-bluesky/tasks/validate_config.yml
+++ b/roles/custom/matrix-bridge-mautrix-bluesky/tasks/validate_config.yml
@@ -20,6 +20,7 @@
     - {'old': 'matrix_mautrix_bluesky_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_bluesky_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_mautrix_bluesky_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_bluesky_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mautrix_bluesky_docker_src_files_path', 'new': 'matrix_mautrix_bluesky_container_src_files_path'}
+    - {'old': 'matrix_mautrix_bluesky_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required mautrix-bluesky settings not defined
   ansible.builtin.fail: