diff --git a/00_junit_best_practice/build.gradle b/00_junit_best_practice/build.gradle
index f9f74c4..6dffca4 100644
--- a/00_junit_best_practice/build.gradle
+++ b/00_junit_best_practice/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     // Main-dependency needed for JUnit 5
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
+    testCompile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
 
 
     // Commons
@@ -8,5 +8,5 @@ dependencies {
 
 
     // Logging
-    testCompile "org.slf4j:slf4j-simple:${slf4j_version}"
+    testCompile "org.slf4j:slf4j-simple:$slf4j_version"
 }
\ No newline at end of file
diff --git a/01_junit_5/build.gradle b/01_junit_5/build.gradle
index 94d4ef6..d27c7f0 100644
--- a/01_junit_5/build.gradle
+++ b/01_junit_5/build.gradle
@@ -1,10 +1,10 @@
 dependencies {
     // Main-dependency needed for JUnit 5
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
+    testCompile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
 
 
     // Lagacy support for JUnit 4
-    testCompile "org.junit.vintage:junit-vintage-engine:${junit5_vintage4_version}"
+    testCompile "org.junit.vintage:junit-vintage-engine:$junit5_vintage4_version"
 
 
     // Commons
@@ -12,5 +12,5 @@ dependencies {
 
 
     // Logging
-    testCompile "org.slf4j:slf4j-simple:${slf4j_version}"
+    testCompile "org.slf4j:slf4j-simple:$slf4j_version"
 }
\ No newline at end of file
diff --git a/02_assertj/build.gradle b/02_assertj/build.gradle
index 264fc05..7fe59ef 100644
--- a/02_assertj/build.gradle
+++ b/02_assertj/build.gradle
@@ -1,14 +1,14 @@
 dependencies {
     // Main-dependency needed for JUnit 5
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
+    testCompile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
 
 
     // AssertJ
-    testCompile "org.assertj:assertj-core:${assertj_version}"
+    testCompile "org.assertj:assertj-core:$assertj_version"
 
 
     // Hamcrest for comparison
-    testCompile "org.hamcrest:hamcrest-all:${hamcrest_version}"
+    testCompile "org.hamcrest:hamcrest-all:$hamcrest_version"
 
 
     // Commons
@@ -16,5 +16,5 @@ dependencies {
 
 
     // Logging
-    testCompile "org.slf4j:slf4j-simple:${slf4j_version}"
+    testCompile "org.slf4j:slf4j-simple:$slf4j_version"
 }
diff --git a/03_spring/03_01_spring_boot_4/build.gradle b/03_spring/03_01_spring_boot_4/build.gradle
index cab0899..ec6b8a6 100644
--- a/03_spring/03_01_spring_boot_4/build.gradle
+++ b/03_spring/03_01_spring_boot_4/build.gradle
@@ -1,21 +1,21 @@
 dependencies {
     // Main-dependency needed for JUnit 5
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
+    testCompile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
 
     // Lagacy support for JUnit 4
-    testCompile "org.junit.vintage:junit-vintage-engine:${junit5_vintage4_version}"
+    testCompile "org.junit.vintage:junit-vintage-engine:$junit5_vintage4_version"
 
     // Spring Boot 4
-    compile "org.springframework.boot:spring-boot-starter-data-jpa:${spring4_boot_version}"
-    testCompile "org.springframework.boot:spring-boot-starter-test:${spring4_boot_version}"
+    compile "org.springframework.boot:spring-boot-starter-data-jpa:$spring4_boot_version"
+    testCompile "org.springframework.boot:spring-boot-starter-test:$spring4_boot_version"
     // JUnit 5 Extension for Spring 4 Tests
-    testCompile "com.github.sbrannen:spring-test-junit5:${junit5_spring4_test_version}"
+    testCompile "com.github.sbrannen:spring-test-junit5:$junit5_spring4_test_version"
 
 
     // Commons
     testCompile project(":common")
 
     // Database Drivers
-    runtime "org.hsqldb:hsqldb:${hsqldb_driver_version}"
-    runtime "org.postgresql:postgresql:${postgresql_driver_version}"
+    runtime "org.hsqldb:hsqldb:$hsqldb_driver_version"
+    runtime "org.postgresql:postgresql:$postgresql_driver_version"
 }
\ No newline at end of file
diff --git a/03_spring/03_02_spring_boot_5/build.gradle b/03_spring/03_02_spring_boot_5/build.gradle
index ba24e5a..b50665f 100644
--- a/03_spring/03_02_spring_boot_5/build.gradle
+++ b/03_spring/03_02_spring_boot_5/build.gradle
@@ -1,13 +1,13 @@
 dependencies {
     // Main-dependency needed for JUnit 5
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
+    testCompile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
     // Lagacy support for JUnit 4
-    testCompile "org.junit.vintage:junit-vintage-engine:${junit5_vintage4_version}"
+    testCompile "org.junit.vintage:junit-vintage-engine:$junit5_vintage4_version"
 
 
     // Spring Boot 5
-    compile "org.springframework.boot:spring-boot-starter-data-jpa:${spring5_boot_version}"
-    testCompile "org.springframework.boot:spring-boot-starter-test:${spring5_boot_version}"
+    compile "org.springframework.boot:spring-boot-starter-data-jpa:$spring5_boot_version"
+    testCompile "org.springframework.boot:spring-boot-starter-test:$spring5_boot_version"
 
 
     // Commons
@@ -15,6 +15,6 @@ dependencies {
 
 
     // Database Drivers
-    runtime "org.hsqldb:hsqldb:${hsqldb_driver_version}"
-    runtime "org.postgresql:postgresql:${postgresql_driver_version}"
+    runtime "org.hsqldb:hsqldb:$hsqldb_driver_version"
+    runtime "org.postgresql:postgresql:$postgresql_driver_version"
 }
\ No newline at end of file
diff --git a/03_spring/03_03_spring_4/build.gradle b/03_spring/03_03_spring_4/build.gradle
index 85239e7..2f034ac 100644
--- a/03_spring/03_03_spring_4/build.gradle
+++ b/03_spring/03_03_spring_4/build.gradle
@@ -1,18 +1,18 @@
 dependencies {
     // Main-dependency needed for JUnit 5
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
+    testCompile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
     // Lagacy support for JUnit 4
-    testCompile "org.junit.vintage:junit-vintage-engine:${junit5_vintage4_version}"
+    testCompile "org.junit.vintage:junit-vintage-engine:$junit5_vintage4_version"
 
 
     // Spring 4
-    compile "org.springframework.data:spring-data-jpa:${spring4_version}"
+    compile "org.springframework.data:spring-data-jpa:$spring4_version"
     // JUnit 5 Extension for Spring 4 Tests
-    testCompile "com.github.sbrannen:spring-test-junit5:${junit5_spring4_test_version}"
+    testCompile "com.github.sbrannen:spring-test-junit5:$junit5_spring4_test_version"
 
 
     // Hibernate JPA
-    compile "org.hibernate:hibernate-core:${hibernate_core_version}"
+    compile "org.hibernate:hibernate-core:$hibernate_core_version"
 
 
     // Commons
@@ -20,6 +20,6 @@ dependencies {
 
 
     // Database Drivers
-    runtime "org.hsqldb:hsqldb:${hsqldb_driver_version}"
-    runtime "org.postgresql:postgresql:${postgresql_driver_version}"
+    runtime "org.hsqldb:hsqldb:$hsqldb_driver_version"
+    runtime "org.postgresql:postgresql:$postgresql_driver_version"
 }
\ No newline at end of file
diff --git a/03_spring/03_04_spring_5/build.gradle b/03_spring/03_04_spring_5/build.gradle
index dc5b1c7..b27b74a 100644
--- a/03_spring/03_04_spring_5/build.gradle
+++ b/03_spring/03_04_spring_5/build.gradle
@@ -1,17 +1,17 @@
 dependencies {
     // Main-dependency needed for JUnit 5
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
+    testCompile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
     // Lagacy support for JUnit 4
-    testCompile "org.junit.vintage:junit-vintage-engine:${junit5_vintage4_version}"
+    testCompile "org.junit.vintage:junit-vintage-engine:$junit5_vintage4_version"
 
 
     // Spring 5
-    compile "org.springframework.data:spring-data-jpa:${spring5_data_jpa_version}"
-    testCompile "org.springframework:spring-test:${spring5_version}"
+    compile "org.springframework.data:spring-data-jpa:$spring5_data_jpa_version"
+    testCompile "org.springframework:spring-test:$spring5_version"
 
 
     // Hibernate JPA
-    compile "org.hibernate:hibernate-core:${hibernate_core_version}"
+    compile "org.hibernate:hibernate-core:$hibernate_core_version"
 
 
     // Commons
@@ -19,6 +19,6 @@ dependencies {
 
 
     // Database Drivers
-    runtime "org.hsqldb:hsqldb:${hsqldb_driver_version}"
-    runtime "org.postgresql:postgresql:${postgresql_driver_version}"
+    runtime "org.hsqldb:hsqldb:$hsqldb_driver_version"
+    runtime "org.postgresql:postgresql:$postgresql_driver_version"
 }
\ No newline at end of file
diff --git a/04_testfx/build.gradle b/04_testfx/build.gradle
index f9f74c4..6dffca4 100644
--- a/04_testfx/build.gradle
+++ b/04_testfx/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     // Main-dependency needed for JUnit 5
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
+    testCompile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
 
 
     // Commons
@@ -8,5 +8,5 @@ dependencies {
 
 
     // Logging
-    testCompile "org.slf4j:slf4j-simple:${slf4j_version}"
+    testCompile "org.slf4j:slf4j-simple:$slf4j_version"
 }
\ No newline at end of file
diff --git a/05_mockito/build.gradle b/05_mockito/build.gradle
index a95a47f..40a322e 100644
--- a/05_mockito/build.gradle
+++ b/05_mockito/build.gradle
@@ -1,10 +1,10 @@
 dependencies {
     // Main-dependency needed for JUnit 5
-    testCompile "org.junit.jupiter:junit-jupiter-api:${junit5_version}"
+    testCompile "org.junit.jupiter:junit-jupiter-api:$junit5_version"
 
 
     // Mockito
-    testCompile "org.mockito:mockito-core:${mockito_version}"
+    testCompile "org.mockito:mockito-core:$mockito_version"
 
 
     // Commons
@@ -12,6 +12,6 @@ dependencies {
 
 
     // Logging
-    testCompile "org.slf4j:slf4j-simple:${slf4j_version}"
+    testCompile "org.slf4j:slf4j-simple:$slf4j_version"
 
 }
diff --git a/build.gradle b/build.gradle
index 18a6fca..8e0b47b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,6 +55,7 @@ allprojects {
     }
 }
 
+
 configure(subprojects - project(":03_spring")) {
 
     apply plugin: 'java'
@@ -65,7 +66,6 @@ configure(subprojects - project(":03_spring")) {
 
     // Gradle-Configuration for JUnit 5 Platform
     junitPlatform {
-        // platformVersion '1.0.0'
         filters {
             engines {
                 // include 'junit-jupiter', 'junit-vintage'
@@ -79,7 +79,7 @@ configure(subprojects - project(":03_spring")) {
         }
     }
     dependencies {
-        testRuntime "org.junit.jupiter:junit-jupiter-engine:${junit5_version}"
-        testRuntime "org.junit.vintage:junit-vintage-engine:${junit5_vintage4_version}"
+        testRuntime "org.junit.jupiter:junit-jupiter-engine:$junit5_version"
+        testRuntime "org.junit.vintage:junit-vintage-engine:$junit5_vintage4_version"
     }
 }
\ No newline at end of file
diff --git a/common/build.gradle b/common/build.gradle
index 2cd3ce7..5568b0e 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
     // Hibernate JPA
-    compile "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:${hibernate_jpa_version}"
+    compile "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$hibernate_jpa_version"
 }