diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffca00f679c5e2470b60739eb1f086b11c42c0ba..fef36d79a9c2ad981dee9d92acdab459f2a0c0b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,11 +7,17 @@ stages:
 - manifest
 - deploy
 
+variables:
+   DOCKER_CONFIG: ~/.docker/$CI_JOB_ID
+
 before_script:
-  - "[ -d ~/.docker ] || 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 $CI_REGISTRY
-  
+
+after_script:
+  - "rm -vRf $DOCKER_CONFIG"
+
 ppc64le:
   variables:
     IMAGE:     $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME