diff --git a/ci_templates/.cic-template.yml b/ci_templates/.cic-template.yml
index 136064e..5445046 100644
--- a/ci_templates/.cic-template.yml
+++ b/ci_templates/.cic-template.yml
@@ -40,7 +40,8 @@ before_script:
       - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" $CI_REGISTRY --password-stdin
     variables:
         CI_DEBUG_TRACE: "true"
-        IMAGE_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
+        # <branch>-<sha1>-<timestamp> https://toolkit.fluxcd.io/guides/sortable-image-tags/
+        IMAGE_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA-$CI_COMMIT_TIMESTAMP
         LATEST_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:latest
     script:
       - docker build -t $IMAGE_TAG -f $DOCKERFILE_PATH .