diff --git a/.editorconfig b/.editorconfig
index 7bd36e0adc..45eea515e7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,3 +15,7 @@ charset = utf-8
 [*.py]
 indent_style = space
 indent_size = 4
+
+[{Makefile,**.mk}]
+# Use tabs for indentation (Makefiles require tabs)
+indent_style = tab
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 8b4bf8dee1..cf49af3c39 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
 # Keep this version number in sync with Jenkinsfile
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
diff --git a/Jenkinsfile b/Jenkinsfile
index 2e555b447f..010a583f6e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 #!groovy
 
 // Keep the version in sync with the one used in pom.xml in order to get correct syntax completion.
-@Library('github.com/cloudogu/ces-build-lib@59d3e94')
+@Library('github.com/cloudogu/ces-build-lib@1.35.1')
 import com.cloudogu.ces.cesbuildlib.*
 
 node('docker') {
@@ -103,8 +103,7 @@ node('docker') {
 String mainBranch
 
 Maven setupMavenBuild() {
-  // Keep this version number in sync with .mvn/maven-wrapper.properties
-  Maven mvn = new MavenWrapper(this)
+  Maven mvn = new MavenWrapperInDocker(this, "scmmanager/java-build:11.0.6_10")
 
   if (isMainBranch()) {
     // Release starts javadoc, which takes very long, so do only for certain branches
diff --git a/build/Dockerfile b/build/Dockerfile
new file mode 100644
index 0000000000..9a6ff05b73
--- /dev/null
+++ b/build/Dockerfile
@@ -0,0 +1,12 @@
+FROM adoptopenjdk/openjdk11:x86_64-debian-jdk-11.0.6_10
+
+# install required packages
+RUN apt-get update \
+ && apt-get install -y \
+    # mercurial is requried for integration tests of the scm-hg-plugin
+    mercurial \
+    # git is required by yarn install of scm-ui
+    git \
+ # clear apt caching
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
diff --git a/build/Makefile b/build/Makefile
new file mode 100644
index 0000000000..84b38faf03
--- /dev/null
+++ b/build/Makefile
@@ -0,0 +1,9 @@
+VERSION:=11.0.6_10
+
+.PHONY:build
+build:
+	docker build -t scmmanager/java-build:${VERSION} .
+
+.PHONY:publish
+publish: build
+	docker push scmmanager/java-build:${VERSION}
diff --git a/build/README.md b/build/README.md
new file mode 100644
index 0000000000..04aac49c1e
--- /dev/null
+++ b/build/README.md
@@ -0,0 +1,3 @@
+# Build tools
+
+This folder contains tools required to build scm-manager