diff --git a/roles/custom/matrix-bot-baibot/defaults/main.yml b/roles/custom/matrix-bot-baibot/defaults/main.yml
index fcbdc7826..7264c4dd4 100644
--- a/roles/custom/matrix-bot-baibot/defaults/main.yml
+++ b/roles/custom/matrix-bot-baibot/defaults/main.yml
@@ -22,7 +22,6 @@ matrix_bot_baibot_container_image: "{{ matrix_bot_baibot_container_image_registr
 matrix_bot_baibot_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_baibot_container_image_self_build else matrix_bot_baibot_container_image_registry_prefix_upstream }}"
 matrix_bot_baibot_container_image_registry_prefix_upstream: "{{ matrix_bot_baibot_container_image_registry_prefix_upstream_default }}"
 matrix_bot_baibot_container_image_registry_prefix_upstream_default: "ghcr.io/"
-matrix_bot_baibot_container_image_force_pull: "{{ matrix_bot_baibot_container_image.endswith(':latest') }}"
 
 matrix_bot_baibot_base_path: "{{ matrix_base_data_path }}/baibot"
 matrix_bot_baibot_config_path: "{{ matrix_bot_baibot_base_path }}/config"
diff --git a/roles/custom/matrix-bot-baibot/tasks/install.yml b/roles/custom/matrix-bot-baibot/tasks/install.yml
index 7ae2c25b0..47ae5bd56 100644
--- a/roles/custom/matrix-bot-baibot/tasks/install.yml
+++ b/roles/custom/matrix-bot-baibot/tasks/install.yml
@@ -38,11 +38,9 @@
   register: matrix_bot_baibot_env_result
 
 - name: Ensure baibot container image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_bot_baibot_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_bot_baibot_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_baibot_container_image_force_pull }}"
+    pull: always
   when: "not matrix_bot_baibot_container_image_self_build | bool"
   register: matrix_bot_baibot_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -62,15 +60,13 @@
       register: matrix_bot_baibot_git_pull_results
 
     - name: Ensure baibot container image is built
-      community.docker.docker_image:
+      community.docker.docker_image_build:
         name: "{{ matrix_bot_baibot_container_image }}"
-        source: build
-        force_source: "{{ matrix_bot_baibot_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_bot_baibot_git_pull_results.changed }}"
-        build:
-          dockerfile: Dockerfile
-          path: "{{ matrix_bot_baibot_container_src_files_path }}"
-          pull: true
+        dockerfile: Dockerfile
+        path: "{{ matrix_bot_baibot_container_src_files_path }}"
+        pull: true
+        rebuild: "{{ 'always' if matrix_bot_baibot_git_pull_results.changed | bool else 'never' }}"
+      register: matrix_bot_baibot_container_image_build_result
 
 - name: Ensure baibot container network is created
   community.general.docker_network:
@@ -94,4 +90,5 @@
         or matrix_bot_baibot_env_result.changed | default(false)
         or matrix_bot_baibot_systemd_service_result.changed | default(false)
         or matrix_bot_baibot_container_image_pull_result.changed | default(false)
+        or matrix_bot_baibot_container_image_build_result.changed | default(false)
       }}
diff --git a/roles/custom/matrix-bot-baibot/tasks/validate_config.yml b/roles/custom/matrix-bot-baibot/tasks/validate_config.yml
index c6eca9657..2352e9eb6 100644
--- a/roles/custom/matrix-bot-baibot/tasks/validate_config.yml
+++ b/roles/custom/matrix-bot-baibot/tasks/validate_config.yml
@@ -91,3 +91,4 @@
   when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
   with_items:
     - {'old': 'matrix_bot_baibot_container_image_name_prefix', 'new': 'matrix_bot_baibot_container_image_registry_prefix'}
+    - {'old': 'matrix_bot_baibot_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}