diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 950816b7e9129c4bf14a256335269c3d4a2ad7ba..dee57be9b8d6d504b5efd1c0760ae1b4bc814f93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ manifest:
     IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
   stage: manifest
   tags:
-    - script
+    - amd64
   script:
     - docker manifest create $IMAGE $IMAGE_amd64 $IMAGE_ppc64le 
     - docker manifest push $IMAGE
diff --git a/Dockerfile b/Dockerfile
index 570612c946d90008d82c74a331417deac0f4a6dd..558c70e2e07d5008df3e5766263d908cf3f9c8e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,8 @@
 FROM buildpack-deps:buster-curl
 
-RUN apt-get update && apt-get install -y ca-certificates libgs9 mime-support \
-	&& apt-get clean autoclean \
-	&& apt-get autoremove --yes \
-        && rm -rf /var/lib/apt/lists/* \
-	&& groupadd -g 1001 vereign && useradd -u 1001 -g vereign vereign
+RUN apt-get update && apt-get install -y ca-certificates libgs9 mime-support && \
+apt-get clean autoclean && \
+apt-get autoremove --yes && \
+rm -rf /var/lib/{apt,dpkg,cache,log} 
 
-WORKDIR /srv
 
-
-
-ONBUILD ARG CI_COMMIT_REF_NAME
-ONBUILD ARG CI_COMMIT_SHA
-
-ONBUILD ARG CI_PROJECT_NAME
-ONBUILD ENV CI_PROJECT_NAME ${CI_PROJECT_NAME}
-
-ONBUILD ARG CI_PROJECT_NAMESPACE
-ONBUILD ENV CI_PROJECT_NAMESPACE ${CI_PROJECT_NAMESPACE}
-
-ONBUILD LABEL project=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME
-
-USER vereign