diff --git a/Dockerfile b/Dockerfile
index 937fbbe33489cdca41538f5ed25366b7a7dc9fc9..dcaa6e442ae6bfee01f881cf0821e59b4f75ab1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,10 +70,8 @@ COPY trainbenchmark-generator-json4ag/ trainbenchmark-generator-json4ag/
 COPY trainbenchmark-generator/ trainbenchmark-generator/
 
 RUN ./gradlew --no-daemon initScripts
-RUN ./gradlew --no-daemon generate; true
-RUN ./gradlew --no-daemon dependencies; true
 RUN ./gradlew --no-daemon trainbenchmark-config:build; true
-RUN ./gradlew --no-daemon trainbenchmark-tool-jastadd-base:build; true
+RUN ./gradlew --no-daemon trainbenchmark-tool:build; true
 
 # END prefetch some gradle-dependencies
 
@@ -116,12 +114,10 @@ RUN chown -R user:user /trainbenchmark
 USER user
 
 RUN ./gradlew --no-daemon initScripts
-# first time shadowJar always fails with jastadd-specialized
-RUN ./gradlew --no-daemon build shadowJar -x test; true
+RUN ./gradlew --no-daemon preprocess
 RUN ./gradlew --no-daemon build shadowJar -x test
 
+# when benchmarking run:
 # RUN ./gradlew --no-daemon generate
-
 # RUN ./gradlew --no-daemon individualInjectBenchmark
 # RUN ./gradlew --no-daemon individualRepairBenchmark
-