diff --git a/.github/workflows/test_autoware.yaml b/.github/workflows/test_autoware.yaml
index 9ac5631a..eea10452 100644
--- a/.github/workflows/test_autoware.yaml
+++ b/.github/workflows/test_autoware.yaml
@@ -32,7 +32,7 @@ jobs:
       - name: Create tag
         run: |
           SHA=${{ github.sha }}
-          TAG=${IMAGE}_${{ matrix.ros_version }}:$(TZ=UTC-9 date '+%Y%m')-${SHA:0:7}
+          TAG=${IMAGE}_${{ matrix.ros_version }}:$(TZ=UTC-9 date '+%Y%m%d_%H%M%S')-${SHA:0:7}
           echo "TAGS=$TAG" >> $GITHUB_ENV
           echo TAG $TAG
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 092ff165..5de473aa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -43,8 +43,12 @@ RUN git clone https://github.com/tier4/caret.git ros2_caret_ws && \
     vcs import src < caret.repos && \
     . /opt/ros/"$ROS_DISTRO"/setup.sh && \
     ./setup_caret.sh -c && \
+    rm -rf src/ros2/ src/ros-tracing/ && \
     colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release
 
+RUN cd ros2_caret_ws/src/CARET/caret_analyze && \
+    git show --format='%H' --no-patch
+
 COPY ./entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]