diff --git a/roles/matrix-bot-maubot/defaults/main.yml b/roles/matrix-bot-maubot/defaults/main.yml
index d5be023f9..7c5cb0eb6 100644
--- a/roles/matrix-bot-maubot/defaults/main.yml
+++ b/roles/matrix-bot-maubot/defaults/main.yml
@@ -4,6 +4,8 @@ matrix_bot_maubot_enabled: true
 matrix_bot_maubot_container_image_self_build: false
 matrix_bot_maubot_docker_repo: "https://mau.dev/maubot/maubot.git"
 matrix_bot_maubot_docker_src_files_path: "{{ matrix_bot_maubot_base_path }}/docker-src"
+matrix_bot_maubot_docker_repo_version: "{{ 'master' if matrix_bot_maubot_version == 'latest' else matrix_bot_maubot_version }}"
+
 
 matrix_bot_maubot_version: v0.3.1
 matrix_bot_maubot_docker_image: "dock.mau.dev/maubot/maubot:{{ matrix_bot_maubot_version }}"
diff --git a/roles/matrix-bot-maubot/tasks/setup_install.yml b/roles/matrix-bot-maubot/tasks/setup_install.yml
index cf350c02c..c136fd897 100644
--- a/roles/matrix-bot-maubot/tasks/setup_install.yml
+++ b/roles/matrix-bot-maubot/tasks/setup_install.yml
@@ -39,6 +39,7 @@
 - name: Ensure maubot repository is present on self-build
   ansible.builtin.git:
     repo: "{{ matrix_bot_maubot_docker_repo }}"
+    version: "{{ matrix_bot_maubot_docker_repo_version }}"
     dest: "{{ matrix_bot_maubot_docker_src_files_path }}"
     force: "yes"
   become: true