diff --git a/.github/workflows/buildah-build-devel.yml b/.github/workflows/buildah-build-devel.yml
index fbf4682..c26857a 100644
--- a/.github/workflows/buildah-build-devel.yml
+++ b/.github/workflows/buildah-build-devel.yml
@@ -6,6 +6,7 @@ on:
   push:
     paths:
       - .github/workflows/buildah-build-devel.yml # Self-trigger
+      - containers/autoware-devel/Dockerfile
 
 env:
   REGISTRY: ghcr.io/bounverif
diff --git a/.github/workflows/buildah-build-runtime.yml b/.github/workflows/buildah-build-runtime.yml
index 65e6011..8d874ee 100644
--- a/.github/workflows/buildah-build-runtime.yml
+++ b/.github/workflows/buildah-build-runtime.yml
@@ -66,7 +66,6 @@ jobs:
             AUTOWARE_VERSION=latest
           extra-args:
             --target autoware-runtime
-            --squash
           containerfiles: |
             containers/autoware-runtime/Dockerfile
 
diff --git a/containers/autoware-devel/Dockerfile b/containers/autoware-devel/Dockerfile
index dddac9e..3e4664e 100644
--- a/containers/autoware-devel/Dockerfile
+++ b/containers/autoware-devel/Dockerfile
@@ -159,7 +159,7 @@ ARG TARGETARCH TARGETOS TARGETPLATFORM TARGETVARIANT
 # Hence, we do not want build artifacts and logs.
 #
 RUN --mount=type=bind,from=autoware-source,source=${AUTOWARE_SOURCE_DIR},target=${AUTOWARE_SOURCE_DIR} \
-    ln -s ${AUTOWARE_SOURCE_DIR} /tmp/autoware/src \
+    ln -s ${AUTOWARE_SOURCE_DIR} /tmp/autoware/src && \
     . /opt/ros/${ROS_DISTRO}/setup.sh && \
     export CCACHE_BASEDIR=/tmp/autoware && \
     colcon --log-base /dev/null build \