diff --git a/0001-Fix-address-of-domjudge-in-proxy.patch b/0001-Fix-address-of-domjudge-in-proxy.patch
index 9a6294376371d668c70952df7949c8b5a79489e8..06ace3e24d2b942dae53e5dbdfd87456cd6d4d52 100644
--- a/0001-Fix-address-of-domjudge-in-proxy.patch
+++ b/0001-Fix-address-of-domjudge-in-proxy.patch
@@ -11,7 +11,7 @@ diff --git a/proxy.py b/proxy.py
 index db4044a..4535fac 100644
 --- a/proxy.py
 +++ b/proxy.py
-@@ -15,8 +15,8 @@ from base64 import b64encode
+@@ -15,7 +15,7 @@ from base64 import b64encode
  
  app = Flask(__name__)
  
diff --git a/Dockerfile b/Dockerfile
index b39d5ac3f3decc9491d5bee69433eb59fe721102..03ca38751387a3614a7e429bcf5160b997b40b9d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:19.04
 
-RUN apt-get update && apt-get -y install \
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive  apt-get -y install \
   git \
   locales \
   wget \
@@ -9,14 +9,27 @@ RUN apt-get update && apt-get -y install \
   bsdmainutils \
   build-essential \
   cmake \
-  golang-go \ 
+  golang-go \
   libsodium-dev \
   libprotobuf-dev \
   qt5-default \
-  qml-module-qtgraphicaleffects
+  qml-module-qtgraphicaleffects \
+  libsodium23 \
+  pkg-config \
+  libncurses5-dev \
+  libncurses5 \
+  python3 \
+  python3-pip \
+  tmux \
+  screen \
+  vim \
+  fonts-symbola \
+  python3-dateutil \
+  qtbase5-dev \
+  qtdeclarative5-dev \
+  protobuf-compiler
 
-RUN apt-get update && apt-get -y install \
-  libsodium23
+RUN pip3 install flask
 
 RUN echo "de_DE.UTF-8 UTF-8\nen_GB.UTF-8\nen_US.UTF-8 UTF-8\n" > /etc/locale.gen
 RUN locale-gen
@@ -37,10 +50,6 @@ RUN git am 0002-Add-case-that-no-freeze-is-used-in-a-contest.patch
 
 WORKDIR /root
 RUN git clone https://github.com/TPolzer/Carnifex
-RUN apt-get -y install \
-  pkg-config \
-  libncurses5-dev \
-  libncurses5
 WORKDIR /root/Carnifex
 
 RUN git am /root/carniprox/carnifex_patch.patch
@@ -48,29 +57,10 @@ RUN git am /root/carniprox/carnifex_patch.patch
 ENV GOPATH=/root/Carnifex
 RUN go get github.com/golang/protobuf/proto github.com/rthornton128/goncurses golang.org/x/crypto/nacl/secretbox golang.org/x/crypto/scrypt
 
-RUN apt-get -y install \
-  qtbase5-dev \
-  qtdeclarative5-dev \
-  protobuf-compiler
-
 RUN go build server
 RUN cmake src/client
 RUN make -j4
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
-  python3 \
-  python3-pip \
-  tmux \
-  screen \
-  vim \
-  fonts-symbola
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
-  python3-dateutil
-
-#COPY config.json /root/Carnifex
-#COPY credentials.json /root/Carnifex
-
 WORKDIR /root/carniprox
 
-RUN pip3 install flask
+CMD ["/bin/bash"]