diff --git a/.github/workflows/autoware-base.yaml b/.github/workflows/autoware-base.yaml
index 71918ea49c3..e3d9720bcc4 100644
--- a/.github/workflows/autoware-base.yaml
+++ b/.github/workflows/autoware-base.yaml
@@ -11,7 +11,7 @@ jobs:
 
   autoware-base-amd64:
     needs: load-env
-    runs-on: buildjet-16vcpu-ubuntu-2204
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out this repository
         uses: actions/checkout@v4
diff --git a/amd64.env b/amd64.env
index 22e12b03f5c..f1a068d50b7 100644
--- a/amd64.env
+++ b/amd64.env
@@ -1,8 +1,8 @@
 rosdistro=humble
 rmw_implementation=rmw_cyclonedds_cpp
 base_image=ros:humble-ros-base-jammy
-autoware_base_image=ghcr.io/youtalk/autoware-base:latest
-autoware_base_cuda_image=ghcr.io/youtalk/autoware-base:cuda-latest
+autoware_base_image=ghcr.io/autowarefoundation/autoware-base:latest
+autoware_base_cuda_image=ghcr.io/autowarefoundation/autoware-base:cuda-latest
 cuda_version=12.3
 cudnn_version=8.9.5.29-1+cuda12.2
 tensorrt_version=8.6.1.6-1+cuda12.0