diff --git a/.github/workflows/autoware-base.yaml b/.github/workflows/autoware-base.yaml
index c4ec32e189..e3d9720bcc 100644
--- a/.github/workflows/autoware-base.yaml
+++ b/.github/workflows/autoware-base.yaml
@@ -9,13 +9,35 @@ jobs:
   load-env:
     uses: ./.github/workflows/load-env.yaml
 
-  docker-build-and-push-base:
+  autoware-base-amd64:
     needs: load-env
     runs-on: ubuntu-22.04
     steps:
       - name: Check out this repository
         uses: actions/checkout@v4
 
+      - name: Free disk space
+        uses: ./.github/actions/free-disk-space
+
+      - name: Build Autoware's base images
+        uses: ./.github/actions/docker-build-and-push-base
+        with:
+          target-image: autoware-base
+          build-args: |
+            *.platform=linux/amd64
+            *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
+            *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
+
+  autoware-base-arm64:
+    needs: [load-env, autoware-base-amd64]
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Check out this repository
+        uses: actions/checkout@v4
+
+      - name: Free disk space
+        uses: ./.github/actions/free-disk-space
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -24,6 +46,6 @@ jobs:
         with:
           target-image: autoware-base
           build-args: |
-            *.platform=linux/amd64,linux/arm64
+            *.platform=linux/arm64
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index dca6fb8a0f..516870c7bb 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -10,6 +10,8 @@ COPY setup-dev-env.sh ansible-galaxy-requirements.yaml amd64.env arm64.env /auto
 COPY ansible/ /autoware/ansible/
 COPY docker/scripts/cleanup_apt.sh /autoware/cleanup_apt.sh
 RUN chmod +x /autoware/cleanup_apt.sh
+COPY docker/scripts/cleanup_system.sh /autoware/cleanup_system.sh
+RUN chmod +x /autoware/cleanup_system.sh
 WORKDIR /autoware
 
 # Install apt packages and add GitHub to known hosts for private repositories