diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e43bb993b9e63ef2f5ebd0c321b85ee0d4916278..5d48fe3d497e7b9124492a85ece6e26601db5abc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,42 +20,31 @@ after_script:
 ppc64le:
   variables:
     IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
-    IMAGE_SHA: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_SHA
   stage: build
   tags:
     - ppc64le
   script:
     - docker build --build-arg ARCH=$CI_JOB_NAME --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
     - docker push $IMAGE
-    - docker tag $IMAGE $IMAGE_SHA
-    - docker push $IMAGE_SHA
 amd64:
   variables:
     IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
-    IMAGE_SHA: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_SHA
   stage: build
   tags:
     - amd64
   script:
     - docker build --build-arg ARCH=$CI_JOB_NAME --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
     - docker push $IMAGE
-    - docker tag $IMAGE $IMAGE_SHA
-    - docker push $IMAGE_SHA
 
 manifest:
   variables:
     IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-    IMAGE_SHA: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_SHA
     IMAGE_amd64: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/amd64:$CI_COMMIT_REF_NAME
-    IMAGE_SHA_amd64: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/amd64:$CI_COMMIT_SHA
     IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
-    IMAGE_SHA_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_SHA
   stage: manifest
   tags:
     - amd64
   script:
     - docker manifest create $IMAGE $IMAGE_amd64 $IMAGE_ppc64le 
     - docker manifest push $IMAGE
-    - docker manifest create $IMAGE_SHA $IMAGE_SHA_amd64 $IMAGE_SHA_ppc64le 
-    - docker manifest push $IMAGE_SHA