diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dee57be9b8d6d504b5efd1c0760ae1b4bc814f93..5a0e1e181ac410b6a353049c60ef149275831223 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,3 @@
-image: docker:latest
-services:
-- docker:dind
-
 stages:
 - build
 - manifest
@@ -22,7 +18,7 @@ ppc64le:
     IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
   stage: build
   tags:
-    - ppc64le
+    - ppc64le-docker
   script:
     - docker build --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $IMAGE -f Dockerfile .
     - docker push $IMAGE
@@ -44,7 +40,7 @@ manifest:
     IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
   stage: manifest
   tags:
-    - amd64
+    - amd64-docker
   script:
     - docker manifest create $IMAGE $IMAGE_amd64 $IMAGE_ppc64le 
     - docker manifest push $IMAGE