diff --git a/interop/Dockerfile b/interop/Dockerfile
index c33c926a..324a6d30 100644
--- a/interop/Dockerfile
+++ b/interop/Dockerfile
@@ -1,6 +1,6 @@
-FROM martenseemann/quic-network-simulator-endpoint:latest
+FROM martenseemann/quic-network-simulator-endpoint:latest AS builder
 
-RUN apt-get update && apt-get install -y wget tar git vim python
+RUN apt-get update && apt-get install -y wget tar git
 
 RUN wget https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz && \
   tar xfz go1.13.3.linux-amd64.tar.gz && \
@@ -18,6 +18,17 @@ RUN git clone https://github.com/lucas-clemente/quic-go && \
 
 WORKDIR /quic-go
 
+RUN go build -o server interop/server/main.go && \
+ go build -o client interop/client/main.go
+
+
+FROM martenseemann/quic-network-simulator-endpoint:latest
+
+WORKDIR /quic-go
+
+COPY --from=builder /quic-go/internal/testdata/cert.pem /quic-go/internal/testdata/priv.key internal/testdata/
+COPY --from=builder /quic-go/server /quic-go/client ./
+
 COPY run_endpoint.sh .
 RUN chmod +x run_endpoint.sh
 
diff --git a/interop/run_endpoint.sh b/interop/run_endpoint.sh
index f48c6245..f25f9c17 100644
--- a/interop/run_endpoint.sh
+++ b/interop/run_endpoint.sh
@@ -10,8 +10,8 @@ if [ "$ROLE" == "client" ]; then
     echo "Starting QUIC client..."
     echo "Client params: $CLIENT_PARAMS"
     echo "Test case: $TESTCASE"
-    QUIC_GO_LOG_LEVEL=debug go run interop/client/main.go $CLIENT_PARAMS $REQUESTS
+    ./client $CLIENT_PARAMS $REQUESTS
 else
     echo "Running QUIC server."
-    QUIC_GO_LOG_LEVEL=debug go run interop/server/main.go "$@"
+    ./server "$@"
 fi