diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba1ff0f..9e5f3a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,4 @@
-stages:
-        - dockerize
-
-variables:
-        IMAGE_NAME: registry.hottis.de/dockerized/httpdispatcher
-        HUB_IMAGE_NAME: wollud1969/httpdispatcher
-
-
-dockerize:
-        stage: dockerize
-        image: wollud1969/docker-bash:0.3
-        tags:
-                - linux
-                - docker
-        script: 
-                - VERSION="$(cat VERSION).$(git rev-list --all --count).$CI_COMMIT_REF_NAME"
-                - cat httpd-vhosts.conf-template | sed -e 's/%AuthLDAPBindDN%/'"${AuthLDAPBindDN/\\/\\\\}"'/' -e 's/%AuthLDAPBindPassword%/'"${AuthLDAPBindPassword//&/\\&}"'/' -e 's@%AuthLDAPURL%@'"$AuthLDAPURL"'@' > httpd-vhosts.conf
-                - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest --tag $HUB_IMAGE_NAME:$VERSION .
-                - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-                - docker push $IMAGE_NAME:latest
-                - docker push $IMAGE_NAME:$VERSION
-                - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD
-                - docker push $HUB_IMAGE_NAME:latest
-                - docker push $HUB_IMAGE_NAME:$VERSION
-
+include:
+        - project: dockerized/commons
+          ref: master
+          file: gitlab-ci-template.yml
diff --git a/Dockerfile b/Dockerfile
index 3c4071c..c2ece34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ RUN \
   mkdir conf/editable/ssl/private && \
   mkdir conf/editable/ssl/certs 
 
-COPY httpd-vhosts.conf conf/editable/
+COPY httpd-vhosts.conf-template conf/editable/
 
 VOLUME /usr/local/apache2/conf/editable
 VOLUME /usr/local/apache2/logs
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 49d5957..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.1