diff --git a/.github/workflows/docker-build-and-push-main-self-hosted.yaml b/.github/workflows/docker-build-and-push-main-self-hosted.yaml
index a7903b9f553..6d372c21c30 100644
--- a/.github/workflows/docker-build-and-push-main-self-hosted.yaml
+++ b/.github/workflows/docker-build-and-push-main-self-hosted.yaml
@@ -31,6 +31,7 @@ jobs:
   docker-build-and-push-main-self-hosted:
     needs: load-env
     runs-on: [self-hosted, linux, ARM64]
+    container: ros:${{ needs.load-env.outputs.rosdistro }}
     strategy:
       fail-fast: false
       matrix:
@@ -56,6 +57,26 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
+      - name: Install pip for rosdep
+        run: |
+          sudo apt-get -y update
+          sudo apt-get -y install python3-pip
+
+      - name: Register AutonomouStuff repository
+        uses: autowarefoundation/autoware-github-actions/register-autonomoustuff-repository@v1
+        with:
+          rosdistro: ${{ needs.load-env.outputs.rosdistro }}
+
+      - name: Set git config
+        uses: autowarefoundation/autoware-github-actions/set-git-config@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run vcs import
+        run: |
+          mkdir src
+          vcs import src < autoware.repos
+
       - name: Free disk space
         uses: ./.github/actions/free-disk-space
 
diff --git a/.github/workflows/docker-build-and-push-main.yaml b/.github/workflows/docker-build-and-push-main.yaml
index 1832d7ac392..72445356fe3 100644
--- a/.github/workflows/docker-build-and-push-main.yaml
+++ b/.github/workflows/docker-build-and-push-main.yaml
@@ -25,6 +25,7 @@ jobs:
   docker-build-and-push-main:
     needs: load-env
     runs-on: buildjet-16vcpu-ubuntu-2204
+    container: ros:${{ needs.load-env.outputs.rosdistro }}
     strategy:
       fail-fast: false
       matrix:
@@ -58,6 +59,26 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
+      - name: Install pip for rosdep
+        run: |
+          sudo apt-get -y update
+          sudo apt-get -y install python3-pip
+
+      - name: Register AutonomouStuff repository
+        uses: autowarefoundation/autoware-github-actions/register-autonomoustuff-repository@v1
+        with:
+          rosdistro: ${{ needs.load-env.outputs.rosdistro }}
+
+      - name: Set git config
+        uses: autowarefoundation/autoware-github-actions/set-git-config@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run vcs import
+        run: |
+          mkdir src
+          vcs import src < autoware.repos
+
       - name: Build 'autoware-openadk'
         if: steps.author-check.outputs.author-found == 'true' || ${{ github.event_name == 'workflow_dispatch' }}
         uses: ./.github/actions/docker-build-and-push