diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1edf83014210f23f8e184ff408d95c4a5132cbdb..dd18bc2323cf61d19f637d06b7ea4cc87795f859 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ ppc64le:
     IMAGE: registry.vereign.com/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
   stage: build
   tags:
-    - $CI_JOB_NAME
+    - ppc64le
   script:
     - docker build --pull --build-arg ARCH=$CI_JOB_NAME -t $IMAGE -f Dockerfile .
     - docker push $IMAGE
@@ -24,7 +24,7 @@ amd64:
     IMAGE: registry.vereign.com/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
   stage: build
   tags:
-    - $CI_JOB_NAME
+    - amd64
   script:
     - docker build --pull --build-arg ARCH=$CI_JOB_NAME -t $IMAGE -f Dockerfile .
     - docker push $IMAGE