diff --git a/roles/custom/matrix-bridge-postmoogle/defaults/main.yml b/roles/custom/matrix-bridge-postmoogle/defaults/main.yml
index a157f1459..17f4cccdc 100644
--- a/roles/custom/matrix-bridge-postmoogle/defaults/main.yml
+++ b/roles/custom/matrix-bridge-postmoogle/defaults/main.yml
@@ -23,7 +23,6 @@ matrix_postmoogle_container_image: "{{ matrix_postmoogle_container_image_registr
 matrix_postmoogle_container_image_registry_prefix: "{{ 'localhost/' if matrix_postmoogle_container_image_self_build else matrix_postmoogle_container_image_registry_prefix_upstream }}"
 matrix_postmoogle_container_image_registry_prefix_upstream: "{{ matrix_postmoogle_container_image_registry_prefix_upstream_default }}"
 matrix_postmoogle_container_image_registry_prefix_upstream_default: "ghcr.io/"
-matrix_postmoogle_container_image_force_pull: "{{ matrix_postmoogle_container_image.endswith(':latest') }}"
 
 matrix_postmoogle_base_path: "{{ matrix_base_data_path }}/postmoogle"
 matrix_postmoogle_config_path: "{{ matrix_postmoogle_base_path }}/config"
diff --git a/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml b/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml
index 84be8e04c..f44bedc3f 100644
--- a/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml
+++ b/roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml
@@ -79,11 +79,9 @@
   register: matrix_postmoogle_env_result
 
 - name: Ensure postmoogle image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_postmoogle_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_postmoogle_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_postmoogle_container_image_force_pull }}"
+    pull: always
   when: "not matrix_postmoogle_container_image_self_build | bool"
   register: matrix_postmoogle_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -102,16 +100,14 @@
   when: "matrix_postmoogle_container_image_self_build | bool"
 
 - name: Ensure postmoogle image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_postmoogle_container_image }}"
-    source: build
-    force_source: "{{ matrix_postmoogle_git_pull_results.changed 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_postmoogle_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_postmoogle_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_postmoogle_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_postmoogle_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_postmoogle_container_image_self_build | bool"
+  register: matrix_postmoogle_container_image_build_result
 
 - name: Ensure postmoogle container network is created
   community.general.docker_network:
@@ -135,4 +131,5 @@
         or matrix_postmoogle_env_result.changed | default(false)
         or matrix_postmoogle_systemd_service_result.changed | default(false)
         or matrix_postmoogle_container_image_pull_result.changed | default(false)
+        or matrix_postmoogle_container_image_build_result.changed | default(false)
       }}
diff --git a/roles/custom/matrix-bridge-postmoogle/tasks/validate_config.yml b/roles/custom/matrix-bridge-postmoogle/tasks/validate_config.yml
index 6306650e0..790424a67 100644
--- a/roles/custom/matrix-bridge-postmoogle/tasks/validate_config.yml
+++ b/roles/custom/matrix-bridge-postmoogle/tasks/validate_config.yml
@@ -21,6 +21,7 @@
     - {'old': 'matrix_postmoogle_docker_repo', 'new': 'matrix_postmoogle_container_repo'}
     - {'old': 'matrix_postmoogle_docker_repo_version', 'new': 'matrix_postmoogle_container_repo_version'}
     - {'old': 'matrix_postmoogle_docker_src_files_path', 'new': 'matrix_postmoogle_container_src_files_path'}
+    - {'old': 'matrix_postmoogle_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required Postmoogle settings not defined
   ansible.builtin.fail: