diff --git a/roles/custom/matrix-pantalaimon/defaults/main.yml b/roles/custom/matrix-pantalaimon/defaults/main.yml
index a218fbd3c..4ff97c4d7 100644
--- a/roles/custom/matrix-pantalaimon/defaults/main.yml
+++ b/roles/custom/matrix-pantalaimon/defaults/main.yml
@@ -19,7 +19,6 @@ matrix_pantalaimon_container_image: "{{ matrix_pantalaimon_container_image_regis
 matrix_pantalaimon_container_image_registry_prefix: "{{ 'localhost/' if matrix_pantalaimon_container_image_self_build else matrix_pantalaimon_container_image_registry_prefix_upstream }}"
 matrix_pantalaimon_container_image_registry_prefix_upstream: "{{ matrix_pantalaimon_container_image_registry_prefix_upstream_default }}"
 matrix_pantalaimon_container_image_registry_prefix_upstream_default: "docker.io/"
-matrix_pantalaimon_container_image_force_pull: "{{ matrix_pantalaimon_container_image.endswith(':latest') }}"
 
 matrix_pantalaimon_base_path: "{{ matrix_base_data_path }}/pantalaimon"
 matrix_pantalaimon_data_path: "{{ matrix_pantalaimon_base_path }}/data"
diff --git a/roles/custom/matrix-pantalaimon/tasks/install.yml b/roles/custom/matrix-pantalaimon/tasks/install.yml
index 2c735c57b..dd8a709d7 100644
--- a/roles/custom/matrix-pantalaimon/tasks/install.yml
+++ b/roles/custom/matrix-pantalaimon/tasks/install.yml
@@ -28,11 +28,9 @@
   register: matrix_pantalaimon_config_result
 
 - name: Ensure pantalaimon container image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_pantalaimon_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_pantalaimon_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_pantalaimon_container_image_force_pull }}"
+    pull: always
   when: "not matrix_pantalaimon_container_image_self_build | bool"
   register: matrix_pantalaimon_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -51,15 +49,14 @@
   when: "matrix_pantalaimon_container_image_self_build | bool"
 
 - name: Ensure pantalaimon container image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_pantalaimon_container_image }}"
-    source: build
-    force_source: "{{ matrix_pantalaimon_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_pantalaimon_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_pantalaimon_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_pantalaimon_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_pantalaimon_container_image_self_build | bool"
+  register: matrix_pantalaimon_container_image_build_result
 
 - name: Ensure pantalaimon container network is created
   community.general.docker_network:
@@ -82,4 +79,5 @@
         matrix_pantalaimon_config_result.changed | default(false)
         or matrix_pantalaimon_systemd_service_result.changed | default(false)
         or matrix_pantalaimon_container_image_pull_result.changed | default(false)
+        or matrix_pantalaimon_container_image_build_result.changed | default(false)
       }}
diff --git a/roles/custom/matrix-pantalaimon/tasks/validate_config.yml b/roles/custom/matrix-pantalaimon/tasks/validate_config.yml
index 4a2a85c14..129e4e0d6 100644
--- a/roles/custom/matrix-pantalaimon/tasks/validate_config.yml
+++ b/roles/custom/matrix-pantalaimon/tasks/validate_config.yml
@@ -16,6 +16,7 @@
     - {'old': 'matrix_pantalaimon_docker_image_registry_prefix', 'new': 'matrix_pantalaimon_container_image_registry_prefix'}
     - {'old': 'matrix_pantalaimon_docker_image_registry_prefix_upstream', 'new': 'matrix_pantalaimon_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_pantalaimon_docker_image_registry_prefix_upstream_default', 'new': 'matrix_pantalaimon_container_image_registry_prefix_upstream_default'}
+    - {'old': 'matrix_pantalaimon_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required Pantalaimon variables are undefined
   ansible.builtin.fail: