diff --git a/.env.tpl b/.env.tpl
index 39e1737..88663d0 100644
--- a/.env.tpl
+++ b/.env.tpl
@@ -1,3 +1,7 @@
-CQPSERVER_HOST=
-CQPSERVER_PASSWORD=
-CQPSERVER_USER=
+# CQPSERVER_HOST=
+# CQPSERVER_PASSWORD=
+# CQPSERVER_USER=
+
+# HOST_CQPSERVER_DATA_DIR=
+# HOST_CQPSERVER_FILES_DIR=
+# HOST_CQPSERVER_REGISTRY_DIR=
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d97cac..9ee7b2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,5 @@
 image: docker:19.03.13
 
-variables:
-  DOCKER_TLS_CERTDIR: "/certs"
-
 services:
   - docker:19.03.13-dind
 
@@ -10,6 +7,10 @@ stages:
   - build
   - push
 
+variables:
+  DOCKER_TLS_CERTDIR: "/certs"
+  INTERMEDIATE_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA
+
 .reg_setup:
   before_script:
     - apk add --no-cache curl
@@ -28,8 +29,6 @@ build_image:
   stage: build
   tags:
     - docker
-  variables:
-    INTERMEDIATE_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
 
 push_master:
   extends:
@@ -47,7 +46,6 @@ push_master:
     - docker
   variables:
     IMAGE_TAG: $CI_REGISTRY_IMAGE:latest
-    INTERMEDIATE_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
 
 push_other:
   extends:
@@ -68,4 +66,3 @@ push_other:
     - docker
   variables:
     IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
-    INTERMEDIATE_IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
diff --git a/Dockerfile b/Dockerfile
index 78f0525..f501c87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 FROM debian:buster-slim
 
 
-LABEL authors="Patrick Jentsch <p.jentsch@uni-bielefeld.de>, Stephan Porada <sporada@uni-bielefeld.de>"
+LABEL authors="Patrick Jentsch <p.jentsch@uni-bielefeld.de>, Stephan Porada <porada@posteo.de>"
 
 
-ARG CWB_REVISION=1499
+ARG CWB_REVISION=1615
 ARG CWB_PLATFORM=linux-64
 ARG CWB_SITE=standard
 ENV LANG=C.UTF-8
@@ -20,7 +20,6 @@ WORKDIR /root
 RUN apt-get update \
  && apt-get install --no-install-recommends --yes \
     subversion autoconf bison flex gcc make pkg-config libc6-dev libncurses5 libncurses5-dev libpcre3-dev libglib2.0-0 libglib2.0-dev libreadline7 libreadline-dev \
- && rm -r /var/lib/apt/lists/* \
  && svn checkout "http://svn.code.sf.net/p/cwb/code/cwb/trunk@${CWB_REVISION}" cwb \
  && cd cwb \
  && make clean PLATFORM=${CWB_PLATFORM} SITE=${CWB_SITE} \
@@ -28,11 +27,11 @@ RUN apt-get update \
  && make all PLATFORM=${CWB_PLATFORM} SITE=${CWB_SITE} \
  && make install PLATFORM=${CWB_PLATFORM} SITE=${CWB_SITE} \
  && make realclean PLATFORM=${CWB_PLATFORM} SITE=${CWB_SITE} \
- && cd .. \
+ && cd - > /dev/null \
  && rm -r cwb
 
 
-## Installation: Perl CWB package ##
+## Install Perl CWB package ##
 RUN yes | cpan HTML::Entities \
  && svn checkout "http://svn.code.sf.net/p/cwb/code/perl/trunk/CWB@${CWB_REVISION}" perl-cwb \
  && cd perl-cwb \
@@ -40,11 +39,14 @@ RUN yes | cpan HTML::Entities \
  && make \
  && make test \
  && make install \
- && cd .. \
+ && cd - > /dev/null \
  && rm -r perl-cwb
 
 
 COPY docker-entrypoint.sh /usr/local/bin/
 
 
+RUN rm -r /var/lib/apt/lists/*
+
+
 ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index d553c4b..916a11a 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -20,7 +20,8 @@ elif [[ "$1" == "build-corpus" ]]; then
     -f /root/files/corpus.vrt \
     -R /usr/local/share/cwb/registry/corpus \
     -P lemma -P simple_pos -P pos -P ner \
-    -S text:0+address+author+booktitle+chapter+editor+institution+journal+pages+publisher+publishing_year+school+title -S s \
+    -S ent:0+type -S s \
+    -S text:0+address+author+booktitle+chapter+editor+institution+journal+pages+publisher+publishing_year+school+title \
     -xsB -9
   cwb-make \
     -V CORPUS