diff --git a/build/cqpserver/Dockerfile b/build/cqpserver/Dockerfile
index 4fbdebb..2525c7c 100644
--- a/build/cqpserver/Dockerfile
+++ b/build/cqpserver/Dockerfile
@@ -1,36 +1,42 @@
 FROM debian:10-slim
 
+
 LABEL maintainer="inf_sfb1288@lists.uni-bielefeld.de"
 
+
+ARG CWB_REVISION=1539
+ARG CWB_PLATFORM=linux-64
+ARG CWB_SITE=standard
 ENV LANG=C.UTF-8
 
+
 EXPOSE 4877
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    ca-certificates \
-    subversion \
-    wget
+
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
+    subversion
+
 
 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 \
- && 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 \
+ && 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} \
+ && make depend PLATFORM=${CWB_PLATFORM} SITE=${CWB_SITE} \
+ && 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 .. \
- && rm -r cwb-3.4.22
+ && rm -r cwb
 
 # Installation: Perl CWB package
 RUN yes | cpan HTML::Entities \
- && svn checkout http://svn.code.sf.net/p/cwb/code/perl/trunk/CWB@1522 perl-cwb \
+ && svn checkout http://svn.code.sf.net/p/cwb/code/perl/trunk/CWB@${CWB_REVISION} perl-cwb \
  && cd perl-cwb \
  && perl Makefile.PL \
  && make \
@@ -39,9 +45,11 @@ RUN yes | cpan HTML::Entities \
  && cd .. \
  && rm -r perl-cwb
 
-# Cleanup
-RUN rm -r /var/lib/apt/lists/*
+
+RUN rm -rf /var/lib/apt/lists/*
+
 
 COPY docker-entrypoint.sh /usr/local/bin/
 
+
 ENTRYPOINT ["docker-entrypoint.sh"]