diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml
index 24d564f6e8b..1dda6a4439f 100644
--- a/.github/actions/docker-build-and-push/action.yaml
+++ b/.github/actions/docker-build-and-push/action.yaml
@@ -122,17 +122,6 @@ runs:
           latest=false
           suffix=-universe-devel${{ inputs.tag-suffix }}
 
-    - name: Docker meta for autoware:devel
-      id: meta-devel
-      uses: docker/metadata-action@v5
-      with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
-        tags: ${{ steps.set-docker-tags.outputs.tags }}
-        bake-target: docker-metadata-action-devel
-        flavor: |
-          latest=false
-          suffix=-devel${{ inputs.tag-suffix }}
-
     - name: Docker meta for autoware:universe
       id: meta-universe
       uses: docker/metadata-action@v5
@@ -160,7 +149,6 @@ runs:
           ${{ steps.meta-base.outputs.bake-file }}
           ${{ steps.meta-core-devel.outputs.bake-file }}
           ${{ steps.meta-universe-devel.outputs.bake-file }}
-          ${{ steps.meta-devel.outputs.bake-file }}
           ${{ steps.meta-universe.outputs.bake-file }}
         provenance: false
         set: |
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a346470a029..8f62a41003b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -31,6 +31,9 @@ RUN --mount=type=ssh \
   && echo "source /opt/ros/${ROS_DISTRO}/setup.bash" > /etc/bash.bashrc
 
 # Create entrypoint
+COPY docker/etc/ros_entrypoint.sh /ros_entrypoint.sh
+RUN chmod +x /ros_entrypoint.sh
+ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["/bin/bash"]
 
 # hadolint ignore=DL3006
@@ -110,10 +113,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG ROS_DISTRO
 ENV CCACHE_DIR="/root/.ccache"
 
-# Set up development environment
+# Set up development environment and tools
 RUN --mount=type=ssh \
   --mount=type=cache,target=/var/cache/apt,sharing=locked \
   ./setup-dev-env.sh -y --module all openadkit \
+  && ./setup-dev-env.sh -y --module dev-tools openadkit \
   && pip uninstall -y ansible ansible-core \
   && apt-get autoremove -y && rm -rf "$HOME"/.cache
 
@@ -138,6 +142,9 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
   && du -sh ${CCACHE_DIR} && ccache -s \
   && rm -rf /autoware/build
 
+ENTRYPOINT ["/ros_entrypoint.sh"]
+CMD ["/bin/bash"]
+
 FROM core-devel AS universe-common-devel
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG ROS_DISTRO
@@ -170,6 +177,9 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
   && du -sh ${CCACHE_DIR} && ccache -s \
   && rm -rf /autoware/build
 
+ENTRYPOINT ["/ros_entrypoint.sh"]
+CMD ["/bin/bash"]
+
 FROM universe-common-devel AS universe-sensing-perception-devel
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG ROS_DISTRO
@@ -199,6 +209,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
   && du -sh ${CCACHE_DIR} && ccache -s \
   && rm -rf /autoware/build
 
+ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["/bin/bash"]
 
 FROM universe-common-devel AS universe-devel
@@ -244,21 +255,6 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \
   && du -sh ${CCACHE_DIR} && ccache -s \
   && rm -rf /autoware/build
 
-CMD ["/bin/bash"]
-
-FROM universe-devel AS devel
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-# Install development tools and artifacts
-RUN --mount=type=ssh \
-  --mount=type=cache,target=/var/cache/apt,sharing=locked \
-  ./setup-dev-env.sh -y --module dev-tools openadkit \
-  && pip uninstall -y ansible ansible-core \
-  && apt-get autoremove -y && rm -rf "$HOME"/.cache
-
-# Create entrypoint
-COPY docker/etc/ros_entrypoint.sh /ros_entrypoint.sh
-RUN chmod +x /ros_entrypoint.sh
 ENTRYPOINT ["/ros_entrypoint.sh"]
 CMD ["/bin/bash"]
 
@@ -293,8 +289,5 @@ COPY --from=universe-devel /opt/autoware /opt/autoware
 COPY docker/etc/.bash_aliases /root/.bash_aliases
 RUN echo "source /opt/autoware/setup.bash" > /etc/bash.bashrc
 
-# Create entrypoint
-COPY docker/etc/ros_entrypoint.sh /ros_entrypoint.sh
-RUN chmod +x /ros_entrypoint.sh
 ENTRYPOINT ["/ros_entrypoint.sh"]
-CMD ["bash"]
+CMD ["/bin/bash"]
diff --git a/docker/docker-bake.hcl b/docker/docker-bake.hcl
index 978f622fadb..7e48cbf8b1d 100644
--- a/docker/docker-bake.hcl
+++ b/docker/docker-bake.hcl
@@ -1,12 +1,11 @@
 group "default" {
-  targets = ["base", "core-devel", "universe-devel", "devel", "universe"]
+  targets = ["base", "core-devel", "universe-devel", "universe"]
 }
 
 // For docker/metadata-action
 target "docker-metadata-action-base" {}
 target "docker-metadata-action-core-devel" {}
 target "docker-metadata-action-universe-devel" {}
-target "docker-metadata-action-devel" {}
 target "docker-metadata-action-universe" {}
 
 target "base" {
@@ -27,12 +26,6 @@ target "universe-devel" {
   target = "universe-devel"
 }
 
-target "devel" {
-  inherits = ["docker-metadata-action-devel"]
-  dockerfile = "docker/Dockerfile"
-  target = "devel"
-}
-
 target "universe" {
   inherits = ["docker-metadata-action-universe"]
   dockerfile = "docker/Dockerfile"