diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index b1b8a1b..c4882be 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -18,15 +18,23 @@ jobs:
         run: |
           echo "REGISTRY_HOST=$(echo ${{ gitea.server_url }} | sed 's|https\?://||')" >> "$GITEA_ENV"
 
+      - name: Set extra image tag
+        run: |
+          echo "EXTRA_IMAGE_TAG=$(date +%Y-%m-%d)-$(git rev-parse --short HEAD)" >> "$GITEA_ENV"
+
       - name: Checkout
         run: |
           git clone --quiet ${{ gitea.server_url }}/${{ gitea.repository }} .
 
       - name: Build image
         run: |
-          buildah bud -t ${{ env.REGISTRY_HOST }}/${{ gitea.repository }}:latest .
+          buildah bud \
+            -t ${{ env.REGISTRY_HOST }}/${{ gitea.repository }}:latest \
+            -t ${{ env.REGISTRY_HOST }}/${{ gitea.repository }}:${{ env.EXTRA_IMAGE_TAG }} \
+            .
 
       - name: Push image
         run: |
           buildah login -u ${{ secrets.CONTAINER_REGISTRY_USER }} -p ${{ secrets.CONTAINER_REGISTRY_PASSWORD }} ${{ env.REGISTRY_HOST }}
           buildah push ${{ env.REGISTRY_HOST }}/${{ gitea.repository }}:latest
+          buildah push ${{ env.REGISTRY_HOST }}/${{ gitea.repository }}:${{ env.EXTRA_IMAGE_TAG }}