diff --git a/build/cqpserver/Dockerfile b/build/cqpserver/Dockerfile
index e32b043..3730c17 100644
--- a/build/cqpserver/Dockerfile
+++ b/build/cqpserver/Dockerfile
@@ -3,29 +3,30 @@ FROM debian:10-slim
 LABEL maintainer="inf_sfb1288@lists.uni-bielefeld.de"
 
 ENV LANG=C.UTF-8
-ENV PLATFORM=linux-64
-ENV SITE=standard
 
 EXPOSE 4877
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    subversion
+    ca-certificates \
+    subversion \
+    wget
 
 WORKDIR /root
 
 # Installation: IMS Open Corpus Workbench
 RUN apt-get install -y --no-install-recommends \
- autoconf bison flex gcc make pkg-config libc6-dev libncurses5 libncurses5-dev libpcre3-dev libglib2.0-0 libglib2.0-dev libreadline7 libreadline-dev \
- && svn co http://svn.code.sf.net/p/cwb/code/cwb/trunk cwb \
- && cd cwb \
- && make clean \
- && make depend \
- && make all \
- && make install \
- && make realclean \
+    autoconf bison flex gcc make pkg-config libc6-dev libncurses5 libncurses5-dev libpcre3-dev libglib2.0-0 libglib2.0-dev libreadline7 libreadline-dev
+ && wget https://sourceforge.net/projects/cwb/files/cwb/cwb-3.4-beta/cwb-3.4.22-source.tar.gz \
+ && tar -xf cwb-3.4.22-source.tar.gz \
+ && cd cwb-3.4.22 \
+ && make clean PLATFORM=linux-64 SITE=standard \
+ && make depend PLATFORM=linux-64 SITE=standard \
+ && make all PLATFORM=linux-64 SITE=standard \
+ && make install PLATFORM=linux-64 SITE=standard \
+ && make realclean PLATFORM=linux-64 SITE=standard \
  && cd .. \
- && rm -r cwb
+ && rm -r cwb-3.4.22
 
 # Installation: Perl CWB package
 RUN yes | cpan HTML::Entities \
diff --git a/build/cqpserver/docker-entrypoint.sh b/build/cqpserver/docker-entrypoint.sh
index e42b8bf..be87205 100755
--- a/build/cqpserver/docker-entrypoint.sh
+++ b/build/cqpserver/docker-entrypoint.sh
@@ -15,8 +15,7 @@ if [ "${1}" == "build-corpus" ]; then
       -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 \
-      -0 corpus \
-      -xsB
+      -xsB -9
     cwb-make \
       -V CORPUS
 elif [ "${1}" == "cqpserver" ]; then