diff --git a/core/.dockerignore b/core/.dockerignore
index 8fc7d95cf8..68f3d70ecd 100644
--- a/core/.dockerignore
+++ b/core/.dockerignore
@@ -1,3 +1,3 @@
 *
 !docker/
-!jettyRunExtraFiles/
+!extraConfigFor/
diff --git a/core/Dockerfile b/core/Dockerfile
index 35ef31f73c..8265ae60f9 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -50,7 +50,7 @@ CMD ["/usr/local/tomcat/bin/docker-start-print"]
 
 FROM runner AS tester
 
-COPY jettyRunExtraFiles/mapfish-spring-application-context-override-acceptancetests.xml \
+COPY extraConfigFor/acceptanceTests/mapfish-spring-application-context-override-acceptancetests.xml \
   /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/mapfish-spring-application-context-override.xml
 
 FROM runner AS watcher
diff --git a/core/jettyRunExtraFiles/mapfish-spring-application-context-override-acceptancetests.xml b/core/extraConfigFor/acceptanceTests/mapfish-spring-application-context-override-acceptancetests.xml
similarity index 100%
rename from core/jettyRunExtraFiles/mapfish-spring-application-context-override-acceptancetests.xml
rename to core/extraConfigFor/acceptanceTests/mapfish-spring-application-context-override-acceptancetests.xml
diff --git a/core/jettyRunExtraFiles/mapfish-spring-application-context-override.xml b/core/extraConfigFor/docs/mapfish-spring-application-context-override.xml
similarity index 100%
rename from core/jettyRunExtraFiles/mapfish-spring-application-context-override.xml
rename to core/extraConfigFor/docs/mapfish-spring-application-context-override.xml
diff --git a/docs/build.gradle b/docs/build.gradle
index 0b8f2ad75d..0382e17b6b 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -59,7 +59,7 @@ tasks.register('buildDocs', JavaExec) {
 
     def javadocs = project(':core').tasks.javadoc.destinationDir
     def basicAppContext = 'classpath*:mapfish-spring-application-context.xml'
-    def appContext = project(':core').projectDir.toURI().toString() + '/jettyRunExtraFiles/*.xml'
+    def appContext = project(':core').projectDir.toURI().toString() + '/extraConfigFor/docs/*.xml'
     def appContext2 = project(':core').webAppDir.toURI().toString() + '/WEB-INF/mapfish-print-servlet.xml'
     def overrideAppContext = 'classpath*:mapfish-spring-application-context-override.xml'
     args site, javadocs, basicAppContext, appContext, appContext2, overrideAppContext