diff --git a/build/cqpserver/Dockerfile b/build/cqpserver/Dockerfile
index e4a338e..3915885 100644
--- a/build/cqpserver/Dockerfile
+++ b/build/cqpserver/Dockerfile
@@ -1,4 +1,12 @@
-FROM debian:stretch-slim
+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
@@ -14,27 +22,29 @@ WORKDIR /root
 
 
 # Installation: IMS Open Corpus Workbench
-RUN svn -q export http://svn.code.sf.net/p/cwb/code/cwb/trunk cwb && \
-    cd cwb && \
-    echo "PLATFORM=linux-64\nSITE=standard" | cat - config.mk > temp && mv temp config.mk && \
-    make clean && \
-    make depend && \
-    make all && \
-    make install && \
-    cd ..
+RUN svn -q export http://svn.code.sf.net/p/cwb/code/cwb/trunk cwb \
+ && cd cwb \
+ && make clean \
+ && make depend \
+ && make all \
+ && make install \
+ && cd .. \
+ && rm -r cwb
 
 
 # Installation: Perl CWB package
-RUN echo "yes" | cpan HTML::Entities && \
-    svn -q export http://svn.code.sf.net/p/cwb/code/perl/trunk/CWB perl-cwb && \
-    cd perl-cwb && \
-    perl Makefile.PL && \
-    make && \
-    make test && \
-    make install && \
-    cd ..
+RUN echo "yes" | cpan HTML::Entities \
+ && svn -q export http://svn.code.sf.net/p/cwb/code/perl/trunk/CWB perl-cwb \
+ && cd perl-cwb \
+ && perl Makefile.PL \
+ && make \
+ && make test \
+ && make install \
+ && cd .. \
+ && rm -r perl-cwb
 
 
 COPY docker-entrypoint.sh /usr/local/bin/
 
+
 ENTRYPOINT ["docker-entrypoint.sh"]