diff --git a/Dockerfile b/Dockerfile
index 260ae5d3b..133d65909 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,18 @@
 FROM navikt/java:15
-ENV JAVA_OPTS --enable-preview
-ENV DUMMYPROP=fraDockerfile
 
 LABEL org.opencontainers.image.source=https://github.com/navikt/vtp
 
-ARG JAR_FILE
-
 # Curl brukes av healthcheck i docker-compose.
-RUN apt-get -qq update && apt-get -qq -y install curl
 RUN mkdir /app/lib
-COPY server/target/lib/*.jar /app/lib/
 
+COPY server/target/lib/*.jar /app/lib/
 COPY server/kafkasecurity.conf /app/
 COPY server/src/main/resources/logback.xml logback.xml
 COPY server/target/app.jar app.jar
-COPY run-java.sh /
-
-EXPOSE 8636 8063 8060 8389 9093
 
-RUN chmod +x /run-java.sh
+ENV JAVA_OPTS="-Dlogback.configurationFile=logback.xml \
+               		-XX:MaxRAMPercentage=75.0 \
+               		-XX:+PrintFlagsFinal \
+               		-Dfile.encoding=UTF8 \
+               		-Duser.timezone=Europe/Oslo \
+               		--enable-preview"
diff --git a/run-java.sh b/run-java.sh
deleted file mode 100644
index 4b6d230cd..000000000
--- a/run-java.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env sh
-
-if [[ $MSYSTEM =~ MINGW* ]]; then
-	set -ex
-	(cd server && exec java ${DEFAULT_JAVA_OPTS} ${JAVA_OPTS} -cp 'target/app.jar;target/lib/*' \
-		-Dlogback.configurationFile=logback.xml \
-		-XX:MaxRAMPercentage=75.0 \
-		-XX:+PrintFlagsFinal \
-		-Dfile.encoding=UTF8 \
-		-Duser.timezone=Europe/Oslo \
-		no.nav.foreldrepenger.vtp.server.MockServer)
-else
-	exec java ${DEFAULT_JAVA_OPTS} ${JAVA_OPTS} -cp app.jar:lib/* \
-		-Dlogback.configurationFile=logback.xml \
-		-XX:MaxRAMPercentage=75.0 \
-		-XX:+PrintFlagsFinal \
-		-Dfile.encoding=UTF8 \
-		-Duser.timezone=Europe/Oslo \
-		no.nav.foreldrepenger.vtp.server.MockServer
-fi
diff --git a/server/pom.xml b/server/pom.xml
index cfbf98108..1f292c395 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -223,6 +223,8 @@
                 <configuration>
                     <archive>
                         <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
                             <mainClass>no.nav.foreldrepenger.vtp.server.MockServer</mainClass>
                         </manifest>
                     </archive>
diff --git a/server/src/main/java/no/nav/foreldrepenger/vtp/server/MockServer.java b/server/src/main/java/no/nav/foreldrepenger/vtp/server/MockServer.java
index 6241f979f..5dfdd832a 100644
--- a/server/src/main/java/no/nav/foreldrepenger/vtp/server/MockServer.java
+++ b/server/src/main/java/no/nav/foreldrepenger/vtp/server/MockServer.java
@@ -66,7 +66,6 @@ public class MockServer {
     private String host = HTTP_HOST;
 
     public MockServer() throws Exception {
-        LOG.info("Dummyprop er satt til: " + System.getenv("DUMMYPROP"));
         this.port = Integer.parseInt(System.getProperty("autotest.vtp.port", SERVER_PORT));
 
         // Bør denne settes fra ENV_VAR?