diff --git a/roles/matrix-ma1sd/tasks/setup_ma1sd.yml b/roles/matrix-ma1sd/tasks/setup_ma1sd.yml
index cef94a24..82595c1d 100644
--- a/roles/matrix-ma1sd/tasks/setup_ma1sd.yml
+++ b/roles/matrix-ma1sd/tasks/setup_ma1sd.yml
@@ -61,7 +61,15 @@
     shell: "./gradlew dockerBuild"
     args:
       chdir: "{{ matrix_ma1sd_docker_src_files_path }}"
-  when: "matrix_ma1sd_enabled|bool and matrix_ma1sd_container_image_self_build"
+    when: "matrix_ma1sd_enabled|bool and matrix_ma1sd_container_image_self_build"
+
+  - name: Ensure ma1sd Docker image is tagged correctly
+    docker_image:
+      name: "{{ matrix_ma1sd_docker_image.split('-')[0] }}"
+      repository: "{{ matrix_ma1sd_docker_image }}"
+      force_tag: yes
+      source: local
+    when: "matrix_ma1sd_enabled|bool and matrix_ma1sd_container_image_self_build"
 
 - name: Ensure ma1sd config installed
   copy: