diff --git a/bin/gradle/wrapper/gradle-wrapper.jar b/bin/gradle/wrapper/gradle-wrapper.jar
index 579764494..28861d273 100644
Binary files a/bin/gradle/wrapper/gradle-wrapper.jar and b/bin/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/bin/gradle/wrapper/gradle-wrapper.properties b/bin/gradle/wrapper/gradle-wrapper.properties
index c5b14abbd..e0b3fb8d7 100644
--- a/bin/gradle/wrapper/gradle-wrapper.properties
+++ b/bin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Oct 12 20:55:45 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
diff --git a/build.gradle b/build.gradle
index 5ce8ab5d2..92ed35d05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,7 @@ subprojects {
     // DO NOT FORGET TO DOCUMENT CHANGES IN CHANGELOG.md
     //
     // Add a GitHub release for every new release: https://github.com/otto-de/edison-microservice/releases
-    version = '2.0.0-m4-SNAPSHOT'
+    version = '2.0.0-m5-SNAPSHOT'
     group = 'de.otto.edison'
 
     repositories {
@@ -59,7 +59,7 @@ subprojects {
     apply from: "${rootDir}/gradle/jacoco.gradle"
     apply from: "${rootDir}/gradle/maven.gradle"
     apply from: "${rootDir}/gradle/signing.gradle"
-}
 
-targetCompatibility = '10'
-sourceCompatibility = '10'
+    targetCompatibility = '1.8'
+    sourceCompatibility = '1.8'
+}
\ No newline at end of file
diff --git a/edison-aws/build.gradle b/edison-aws/build.gradle
index 1114f4f46..b4d9e3532 100644
--- a/edison-aws/build.gradle
+++ b/edison-aws/build.gradle
@@ -16,6 +16,10 @@ dependencies {
 
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/edison-core/build.gradle b/edison-core/build.gradle
index b0f380b12..e70ff9998 100644
--- a/edison-core/build.gradle
+++ b/edison-core/build.gradle
@@ -13,6 +13,10 @@ dependencies {
     testCompile libraries.async_http_client
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/edison-jobs/build.gradle b/edison-jobs/build.gradle
index 7bceee974..9e3c7f406 100644
--- a/edison-jobs/build.gradle
+++ b/edison-jobs/build.gradle
@@ -8,6 +8,10 @@ dependencies {
     testCompile test_libraries.jsonassert
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/edison-mongo/build.gradle b/edison-mongo/build.gradle
index 8fb997aab..7eb77f3c7 100644
--- a/edison-mongo/build.gradle
+++ b/edison-mongo/build.gradle
@@ -13,6 +13,10 @@ dependencies {
     testCompile test_libraries.embedded_mongo
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/edison-oauth/build.gradle b/edison-oauth/build.gradle
index bf263af7e..62afdd814 100644
--- a/edison-oauth/build.gradle
+++ b/edison-oauth/build.gradle
@@ -11,6 +11,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/edison-testsupport/build.gradle b/edison-testsupport/build.gradle
index 5e0d9c7a0..2de30417a 100644
--- a/edison-testsupport/build.gradle
+++ b/edison-testsupport/build.gradle
@@ -16,6 +16,10 @@ dependencies {
     compile test_libraries.spring_boot_starter_test
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/edison-togglz/build.gradle b/edison-togglz/build.gradle
index c0942e9e8..4ffb3a60e 100644
--- a/edison-togglz/build.gradle
+++ b/edison-togglz/build.gradle
@@ -7,6 +7,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/edison-validation/build.gradle b/edison-validation/build.gradle
index 013ee79ba..5a5d25390 100644
--- a/edison-validation/build.gradle
+++ b/edison-validation/build.gradle
@@ -9,6 +9,9 @@ dependencies {
     testImplementation test_libraries.rest_assured
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
 
 artifacts {
     archives jar
diff --git a/examples/example-jobs/build.gradle b/examples/example-jobs/build.gradle
index 3a93a9e28..9d442619e 100644
--- a/examples/example-jobs/build.gradle
+++ b/examples/example-jobs/build.gradle
@@ -8,6 +8,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/examples/example-oauth/build.gradle b/examples/example-oauth/build.gradle
index 0983fd493..a390733b7 100644
--- a/examples/example-oauth/build.gradle
+++ b/examples/example-oauth/build.gradle
@@ -6,6 +6,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/examples/example-status/build.gradle b/examples/example-status/build.gradle
index 1211c89f8..06140ee0a 100644
--- a/examples/example-status/build.gradle
+++ b/examples/example-status/build.gradle
@@ -7,6 +7,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/examples/example-togglz-mongo/build.gradle b/examples/example-togglz-mongo/build.gradle
index c62cce216..e239de28a 100644
--- a/examples/example-togglz-mongo/build.gradle
+++ b/examples/example-togglz-mongo/build.gradle
@@ -8,6 +8,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/examples/example-togglz/build.gradle b/examples/example-togglz/build.gradle
index 4dc40b33a..37bbda589 100644
--- a/examples/example-togglz/build.gradle
+++ b/examples/example-togglz/build.gradle
@@ -6,6 +6,10 @@ dependencies {
     testCompile project(":edison-testsupport")
 }
 
+javadoc {
+    options.addBooleanOption('html5', true)
+}
+
 artifacts {
     archives jar
     archives javadocJar
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 1948b9074..28861d273 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d2c45a4b2..115e6ac0a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists