diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d48fe3d497e7b9124492a85ece6e26601db5abc..50d6e8e5a563ee0987f50391e3eb9b9dca4a651b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ manifest:
     IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
   stage: manifest
   tags:
-    - amd64
+    - script 
   script:
     - docker manifest create $IMAGE $IMAGE_amd64 $IMAGE_ppc64le 
     - docker manifest push $IMAGE
diff --git a/Dockerfile b/Dockerfile
index 216d109ca5ca6885b4d583ecff95d11cd51741e9..027f0ba612e901ce231570f0dac36fdc3c89ee58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,23 @@
-FROM golang:1.10.3
+FROM golang:1.14.1
 
 ENV DEBIAN_FRONTEND=noninteractive 
 RUN 	go get -u github.com/golang/dep/cmd/dep  github.com/ugorji/go/codec/codecgen  \
-		&& echo deb http://deb.debian.org/debian stretch-backports main > /etc/apt/sources.list.d/backports.list \
-                && apt-get update && apt-get install -y libgs-dev ghostscript wkhtmltopdf 
+        && apt-get update && apt-get install -y libgs-dev ghostscript \
+		&& rm -rf /var/lib/apt/lists/* 
+
+ONBUILD ARG GITLAB_LOGIN
+ONBUILD ARG GITLAB_PASSWORD
+
+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
+
+ONBUILD RUN git config --global url."https://$GITLAB_LOGIN:$GITLAB_PASSWORD@code.vereign.com".insteadOf "https://code.vereign.com"
+