diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml
index bc044a66ee..65915acf69 100644
--- a/.github/workflows/docker-build-and-push-arm64.yaml
+++ b/.github/workflows/docker-build-and-push-arm64.yaml
@@ -68,11 +68,11 @@ jobs:
             *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max
 
       # TODO: Uncomment once arm64 builds are FIXED
-      # - name: Build 'Tools'
+      # - name: Build 'autoware-tools'
       #   uses: ./.github/actions/docker-build-and-push-tools
       #   with:
       #     platform: arm64
-      #     target-image: autoware-tools
+      #     target-image: autoware
       #     build-args: |
       #       *.platform=linux/arm64
       #       *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
diff --git a/.github/workflows/docker-build-and-push-tools.yaml b/.github/workflows/docker-build-and-push-tools.yaml
index 36cb8224b4..b69b344bac 100644
--- a/.github/workflows/docker-build-and-push-tools.yaml
+++ b/.github/workflows/docker-build-and-push-tools.yaml
@@ -47,11 +47,11 @@ jobs:
           (github.event_name == 'push' && github.ref_type == 'tag') }}
         uses: ./.github/actions/free-disk-space
 
-      - name: Build 'Tools'
+      - name: Build 'autoware-tools'
         uses: ./.github/actions/docker-build-and-push-tools
         with:
           platform: amd64
-          target-image: autoware-tools
+          target-image: autoware
           build-args: |
             *.platform=linux/amd64
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
index 361279f5ec..36c059704b 100644
--- a/.github/workflows/docker-build-and-push.yaml
+++ b/.github/workflows/docker-build-and-push.yaml
@@ -62,11 +62,11 @@ jobs:
             *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:amd64-main
             *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:amd64-${{ github.ref_name }},mode=max
 
-      - name: Build 'Tools'
+      - name: Build 'autoware-tools'
         uses: ./.github/actions/docker-build-and-push-tools
         with:
           platform: amd64
-          target-image: autoware-tools
+          target-image: autoware
           build-args: |
             *.platform=linux/amd64
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}