diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92664b3dd6f752c8281488e455657645bfb96685..0cbe59f6ffd47a986f9c676a1e27da6ea53706c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,48 +1,9 @@
-stages:
-- build
-- manifest
+include:
+  - project: 'code/ci-template'
+    file: '/go/base.yml'
 
-variables:
-   DOCKER_CONFIG: ~/.docker/$CI_JOB_ID
-
-before_script:
-  - "[ -d $DOCKER_CONFIG ] || mkdir -p $DOCKER_CONFIG"
-  - "echo '{ \"experimental\": \"enabled\" }' > $DOCKER_CONFIG/config.json"
-  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-
-after_script:
-  - "rm -vRf $DOCKER_CONFIG"
-
-ppc64le:
-  variables:
-    IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
-  stage: build
-  tags:
-    - ppc64le-docker
+.build:
   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
 
-amd64:
-  variables:
-    IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_JOB_NAME:$CI_COMMIT_REF_NAME
-  stage: build
-  tags:
-    - amd64-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
-
-manifest:
-  variables:
-    IMAGE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-    IMAGE_amd64: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/amd64:$CI_COMMIT_REF_NAME
-    IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
-  stage: manifest
-  tags:
-    - amd64-docker
-  script:
-    - docker manifest create $IMAGE $IMAGE_amd64 $IMAGE_ppc64le 
-    - docker manifest push $IMAGE
- 
-
diff --git a/Dockerfile b/Dockerfile
index 558c70e2e07d5008df3e5766263d908cf3f9c8e8..fb1584a6c464a6ba6d02db28bf4d6b77fd4064ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,4 +5,6 @@ apt-get clean autoclean && \
 apt-get autoremove --yes && \
 rm -rf /var/lib/{apt,dpkg,cache,log} 
 
+WORKDIR /srv
+