diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc6440e7e8363071414cd0e4742c404c1e97e53b..e43bb993b9e63ef2f5ebd0c321b85ee0d4916278 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,15 +2,21 @@ image: docker:latest
 services:
 - docker:dind
 
+variables:
+   DOCKER_CONFIG: ~/.docker/$CI_JOB_ID
+
 stages:
 - build
 - manifest
 
 before_script:
-  - mkdir ~/.docker
-  - "echo '{ \"experimental\": \"enabled\" }' > ~/.docker/config.json"
+  - "[ -d $DOCKER_CONFIG ] || mkdir -p $DOCKER_CONFIG"
+  - "echo '{ \"experimental\": \"enabled\" }' > $DOCKER_CONFIG/config.json"
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.vereign.com
 
+after_script:
+  - "rm -vRf $DOCKER_CONFIG"
+
 ppc64le:
   variables:
     IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME