diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78e537aecaf90b57fd0de6eca8bf310b11e92cb6..c6336e75c17af7e4a7bd88867a7218453c82379b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,10 @@
-image: registry.vereign.com/docker/docker:master
-services:
- - registry.vereign.com/docker/docker:dind-master
-
 variables:
   DOCKER_CLI_EXPERIMENTAL: 'enabled'
   JOB_IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
   MANIFEST_IMAGE:  $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-  CI_DEBUG_TRACE: "true"
+  IMAGE_amd64: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/amd64:$CI_COMMIT_REF_NAME
+  IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
+  CI_DEBUG_TRACE: "false"
 
 stages:
 - build
@@ -18,7 +16,7 @@ before_script:
 
 .build:
   script:
-    - docker build --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $JOB_IMAGE -f Dockerfile .
+    - docker build --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $JOB_IMAGE -f Dockerfile .
     - docker push $JOB_IMAGE
 
 ppc64le:
@@ -37,9 +35,6 @@ amd64:
 
 manifest:
   stage: manifest
-  variables:
-    IMAGE_amd64: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/amd64:$CI_COMMIT_REF_NAME
-    IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
   tags:
     - ppc64le-docker
   script: