diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 93e445f..f13e13a 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -44,8 +44,9 @@ jobs:
               echo "PUSH_LATEST=true" >> $GITHUB_OUTPUT
               ;;
             refs/heads/main)
+              TIMESTAMP=$(date -u +%Y%m%d%H%M%S)
               SHORT_SHA=$(echo "${{ gitea.sha }}" | cut -c1-7)
-              echo "IMAGE_TAG=${IMAGE_BASE}:${SHORT_SHA}" >> $GITHUB_OUTPUT
+              echo "IMAGE_TAG=${IMAGE_BASE}:${TIMESTAMP}-${SHORT_SHA}" >> $GITHUB_OUTPUT
               echo "PUSH_LATEST=true" >> $GITHUB_OUTPUT
               ;;
             *)
@@ -114,8 +115,9 @@ jobs:
               echo "PUSH_LATEST=true" >> $GITHUB_OUTPUT
               ;;
             refs/heads/main)
+              TIMESTAMP=$(date -u +%Y%m%d%H%M%S)
               SHORT_SHA=$(echo "${{ gitea.sha }}" | cut -c1-7)
-              echo "IMAGE_TAG=${IMAGE_BASE}:frontend-${SHORT_SHA}" >> $GITHUB_OUTPUT
+              echo "IMAGE_TAG=${IMAGE_BASE}:frontend-${TIMESTAMP}-${SHORT_SHA}" >> $GITHUB_OUTPUT
               echo "PUSH_LATEST=true" >> $GITHUB_OUTPUT
               ;;
             *)