diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8e9201698..72b6893b4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,9 +56,9 @@ jobs:
       shell: bash
       run: |
         if ${{ matrix.os == 'macos-latest' || matrix.os == 'macos-14' }}; then
-            mvn -P build-drifty-cli-for-macos-latest package -rf :CLI
+            mvn -P build-drifty-cli-for-macos-latest package
         else
-            mvn -P build-drifty-cli-for-${{ matrix.os }} package -rf :CLI
+            mvn -P build-drifty-cli-for-${{ matrix.os }} package
         fi
     - name: Set Up Maven version 3.8.8 # For GUI build issues, maven version 3.8.8 needs to be used
       if: ${{ matrix.mode == 'GUI' }}
diff --git a/.github/workflows/dev-docker-build.yml b/.github/workflows/dev-docker-build.yml
index 3960ff3ad..ede0dd68b 100644
--- a/.github/workflows/dev-docker-build.yml
+++ b/.github/workflows/dev-docker-build.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         os: [ 'ubuntu-latest', 'macos-14' ] # ubuntu-latest and macos-14 has amd64 and arm64 architecture respectively.
-        image_name_suffix: [ 'base', 'runner', 'cli', 'gui' ]
+        image_name_suffix: [ 'cli', 'gui' ]
       fail-fast: false
     permissions:
       security-events: write
@@ -29,7 +29,10 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Build Docker image
-        run: docker compose build ${{ matrix.image_name_suffix }}
+        run: |
+          docker compose build base
+          docker compose build runner
+          docker compose build ${{ matrix.image_name_suffix }}
       - name: Run Trivy security scan
         uses: aquasecurity/trivy-action@0.17.0
         continue-on-error: true