diff --git a/build.gradle b/build.gradle
index 1375739cadaad2d7af1a2cfd5a2bc31362a60e15..98b762b74e66244a0defb0a381ba996b0824ddec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,17 +23,24 @@ subprojects {
   apply plugin: 'com.github.spotbugs'
 }
 
-
+// Local plugins
 apply plugin: 'java-library'
 
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
+// Java version for all subprojects
+subprojects {
+  java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+  }
+}
+
 
 configurations.all {
     // Check for updates every build
     resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
 }
 
+//
 allprojects {
 	repositories {
 	    jcenter()
diff --git a/uc1-application/build.gradle b/uc1-application/build.gradle
index df2b3b8904e5a3b5ec1dd8c33fe9bf019ffd364f..58d1932323a177b202de3fa6a6bb4b905efd5718 100644
--- a/uc1-application/build.gradle
+++ b/uc1-application/build.gradle
@@ -1,7 +1,3 @@
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
 dependencies {
     compile project(':')
 
diff --git a/uc1-workload-generator/build.gradle b/uc1-workload-generator/build.gradle
index c258a4c5515693f94e1213449edf8ebe698c3396..4ac401e5fa2e2d0de964952673128a899e4f1771 100644
--- a/uc1-workload-generator/build.gradle
+++ b/uc1-workload-generator/build.gradle
@@ -1,7 +1,3 @@
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
 dependencies {
     compile project(':')
 
diff --git a/uc2-application/build.gradle b/uc2-application/build.gradle
index 0cd29ee9740633122b8d8e888ebbf563a6ae0e94..e4161983a6cb964c1f666cc548b32f48801da4aa 100644
--- a/uc2-application/build.gradle
+++ b/uc2-application/build.gradle
@@ -1,7 +1,3 @@
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
 dependencies {
     compile project(':')
 
diff --git a/uc2-workload-generator/build.gradle b/uc2-workload-generator/build.gradle
index 2400cfcd35a9b369e1d6a8328d59d86f9ab23dbd..a59af4ae0d314641d3b3252ecdd7d6e262b59fe3 100644
--- a/uc2-workload-generator/build.gradle
+++ b/uc2-workload-generator/build.gradle
@@ -1,7 +1,3 @@
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
 dependencies {
     compile project(':')
 
diff --git a/uc3-application/build.gradle b/uc3-application/build.gradle
index 112c3fc1f0f07da697b6c4e357cde01548252103..8be200135ddf4667ffc326d71b956f737a89fbe9 100644
--- a/uc3-application/build.gradle
+++ b/uc3-application/build.gradle
@@ -1,7 +1,3 @@
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
 allprojects {
 	repositories {
 	    jcenter()
diff --git a/uc3-workload-generator/build.gradle b/uc3-workload-generator/build.gradle
index 31015e146e683587d7f30d78d491658ca6fcc8a8..87c4073341eb1771be4cf19f34490095b428df72 100644
--- a/uc3-workload-generator/build.gradle
+++ b/uc3-workload-generator/build.gradle
@@ -1,7 +1,3 @@
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
 dependencies {
     compile project(':')
 
diff --git a/uc4-application/build.gradle b/uc4-application/build.gradle
index 31d41bda76bf0dca184f9069e98d723d89e55504..b214dac46358b9d4bceec8af831dcbe1ab913557 100644
--- a/uc4-application/build.gradle
+++ b/uc4-application/build.gradle
@@ -1,7 +1,3 @@
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
 allprojects {
 	repositories {
 	    jcenter()
diff --git a/uc4-workload-generator/build.gradle b/uc4-workload-generator/build.gradle
index 7cd14c2bb719b79f0201df3c215ad69c8019d76a..f2d0178cc5125603f17de63c6c7441850676976e 100644
--- a/uc4-workload-generator/build.gradle
+++ b/uc4-workload-generator/build.gradle
@@ -1,7 +1,3 @@
-
-sourceCompatibility = "1.11"
-targetCompatibility = "1.11"
-
 dependencies {
     compile project(':')