diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81504b60321888419b89a8c2571ca388894ec98f..92978e64852f9b0d34f68c66e7bba3a6383f206e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,8 @@ before_script:
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
 after_script:
-  - "docker rmi $MANIFEST $IMAGE_amd64 $IMAGE_ppc64le ||  true"
+  - "docker image prune -f --filter label=intermediate=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME"
+  - "docker image prune -f --filter label=final=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME"
   - "rm -vRf $DOCKER_CONFIG"
 
 ppc64le:
diff --git a/Dockerfile b/Dockerfile
index d490aab0d50ada83e42072892192bb5e85e4be7f..11d313480d6f65c0ae8bac50f6f014a6b93fc400 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ ENV PATH "$PATH:/srv/bin/"
 ARG CI_PROJECT_NAME
 ARG CI_COMMIT_REF_NAME
 ARG CI_COMMIT_SHA
+LABEL intermediate=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME
 
 ENV CI_PROJECT_NAME ${CI_PROJECT_NAME} 
 
@@ -27,6 +28,8 @@ FROM buildpack-deps:buster-curl
 
 ARG CI_PROJECT_NAME
 ENV CI_PROJECT_NAME ${CI_PROJECT_NAME} 
+ARG CI_COMMIT_REF_NAME
+LABEL final=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME
 
 COPY --from=0 /srv/${CI_PROJECT_NAME} /srv/${CI_PROJECT_NAME}