diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 799f260..0b00055 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,30 +1,22 @@
-include:
-        - project: dockerized/commons
-          ref: master
-          file: gitlab-ci-template.yml
-
 stages:
         - check
         - build
-        - krohnify
 
 variables:
         NEXUS_REGISTRY: devnexus.krohne.com:18079/repository/docker-krohne
         NEXUS_IMAGE_NAME: $NEXUS_REGISTRY/$CI_PROJECT_NAME
 
-krohnify:
-        image: registry.hottis.de/dockerized/docker-bash:latest
-        stage: krohnify
+build:
+    image: docker:stable
+        stage: build
         tags:
-                - krohne
+                - bash
                 - linux
                 - docker
         only:
                 - tags
         script:
-                - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-                - docker pull $IMAGE_NAME:${CI_COMMIT_TAG} 
-                - docker tag $IMAGE_NAME:${CI_COMMIT_TAG} $NEXUS_IMAGE_NAME:${CI_COMMIT_TAG}
+                - docker build -t $NEXUS_IMAGE_NAME:${CI_COMMIT_TAG} .
                 - docker login $NEXUS_REGISTRY --username $NEXUS_USER --password $NEXUS_PASSWORD
                 - docker push $NEXUS_IMAGE_NAME:${CI_COMMIT_TAG}