diff --git a/amd64.env b/amd64.env
index 38eadee0a91..a18f8903d53 100644
--- a/amd64.env
+++ b/amd64.env
@@ -1,6 +1,6 @@
 rosdistro=humble
 rmw_implementation=rmw_cyclonedds_cpp
-base_image=ros:humble-ros-base-jammy
+base_image=ros:humble-ros-core-jammy
 cuda_version=12.3
 cudnn_version=8.9.5.29-1+cuda12.2
 tensorrt_version=8.6.1.6-1+cuda12.0
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3f0a53c0a84..0072039cb4a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -46,7 +46,12 @@ RUN --mount=type=ssh \
 COPY src /autoware/src
 
 # Generate install package lists
-RUN rosdep update && rosdep keys --ignore-src --from-paths src \
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
+    python3-rosdep \
+  && rosdep init \
+  && rosdep update \
+  && rosdep keys --ignore-src --from-paths src \
     | xargs rosdep resolve --rosdistro ${ROS_DISTRO} \
     | grep -v '^#' \
     | sed 's/ \+/\n/g'\
@@ -84,6 +89,8 @@ COPY --from=src-imported /rosdep-all-depend-packages.txt /tmp/rosdep-all-depend-
 RUN --mount=type=ssh \
   apt-get update \
   && cat /tmp/rosdep-all-depend-packages.txt | xargs apt-get install -y --no-install-recommends \
+  && apt-get install -y --no-install-recommends \
+    python3-colcon-common-extensions \
   && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache
 
 # Build Autoware