diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7b4a4278565badc81e6c20c20e67f086bf0c8ff..1edf83014210f23f8e184ff408d95c4a5132cbdb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,28 +4,28 @@ services:
 
 stages:
 - build
-- build-x86
 
-variables:
-  TEST_IMAGE: registry.vereign.com/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-  RELEASE_IMAGE: registry.vereign.com/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:latest
 
 before_script:
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.vereign.com
 
-build:
+ppc64le:
+  variables:
+    IMAGE: registry.vereign.com/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
   stage: build
   tags:
-    - hv2
+    - $CI_JOB_NAME
   script:
-    - docker build --pull -t $TEST_IMAGE -f Dockerfile .
-    - docker push $TEST_IMAGE
+    - docker build --pull --build-arg ARCH=$CI_JOB_NAME -t $IMAGE -f Dockerfile .
+    - docker push $IMAGE
 
-build:
-  stage: build-x86
+amd64:
+  variables:
+    IMAGE: registry.vereign.com/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
+  stage: build
   tags:
-    - dell
+    - $CI_JOB_NAME
   script:
-    - docker build --pull -t ${TEST_IMAGE}-x86 -f Dockerfile .
-    - docker push ${TEST_IMAGE}-x86
+    - docker build --pull --build-arg ARCH=$CI_JOB_NAME -t $IMAGE -f Dockerfile .
+    - docker push $IMAGE