diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b52a41b73..60c9cf5c2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,8 +32,9 @@ test manifest:
     DOCKER_DRIVER: "overlay2"
     GIT_STRATEGY: fetch
   script:
+    - export DATE=$(date +"%Y-%m-%d")
     - export IMAGE="${CI_REGISTRY_IMAGE}/${ARCH}/${TAG}"
-    - export REF="${IMAGE}:${CI_COMMIT_SHA}"
+    - export UID="${IMAGE}:${DATE}-${CI_JOB_ID}"
     - export LATEST="${IMAGE}:latest"
 
     - docker build --pull -f ${DOCKERFILE} -t ${LATEST} ${CONTEXT_DIR}
@@ -49,10 +50,10 @@ test manifest:
     - |
       if [ "$CI_COMMIT_REF_NAME" = "master" -a "$CI_PROJECT_NAMESPACE" = "gstreamer" ]; then
         # Tag the image with the git ref
-        docker image tag ${LATEST} ${REF}
+        docker image tag ${LATEST} ${UID}
         # Push the tags
         docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-        docker push ${REF}
+        docker push ${UID}
         docker push ${LATEST}
       fi