diff --git a/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml b/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml
index c1ae8a704..0c3284bc0 100644
--- a/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml
+++ b/roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml
@@ -33,28 +33,28 @@
   delay: "{{ devture_playbook_help_container_retries_delay }}"
   until: result is not failed
 
-- name: Ensure matrix-registration-bot repository is present on self-build
-  ansible.builtin.git:
-    repo: "{{ matrix_bot_matrix_registration_bot_docker_repo }}"
-    version: "{{ matrix_bot_matrix_registration_bot_docker_repo_version }}"
-    dest: "{{ matrix_bot_matrix_registration_bot_docker_src_files_path }}"
-    force: "yes"
-  become: true
-  become_user: "{{ matrix_user_username }}"
-  register: matrix_bot_matrix_registration_bot_git_pull_results
-  when: "matrix_bot_matrix_registration_bot_container_image_self_build | bool"
+- when: matrix_bot_matrix_registration_bot_container_image_self_build | bool
+  block:
+    - name: Ensure matrix-registration-bot repository is present on self-build
+      ansible.builtin.git:
+        repo: "{{ matrix_bot_matrix_registration_bot_docker_repo }}"
+        version: "{{ matrix_bot_matrix_registration_bot_docker_repo_version }}"
+        dest: "{{ matrix_bot_matrix_registration_bot_docker_src_files_path }}"
+        force: "yes"
+      become: true
+      become_user: "{{ matrix_user_username }}"
+      register: matrix_bot_matrix_registration_bot_git_pull_results
 
-- name: Ensure matrix-registration-bot image is built
-  community.docker.docker_image:
-    name: "{{ matrix_bot_matrix_registration_bot_docker_image }}"
-    source: build
-    force_source: "{{ matrix_bot_matrix_registration_bot_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_matrix_registration_bot_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_bot_matrix_registration_bot_docker_src_files_path }}"
-      pull: true
-  when: "matrix_bot_matrix_registration_bot_container_image_self_build | bool"
+    - name: Ensure matrix-registration-bot image is built
+      community.docker.docker_image:
+        name: "{{ matrix_bot_matrix_registration_bot_docker_image }}"
+        source: build
+        force_source: "{{ matrix_bot_matrix_registration_bot_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_matrix_registration_bot_git_pull_results.changed }}"
+        build:
+          dockerfile: Dockerfile
+          path: "{{ matrix_bot_matrix_registration_bot_docker_src_files_path }}"
+          pull: true
 
 - name: Ensure matrix-registration-bot container network is created
   community.general.docker_network: