diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index cc4fdc29..490fda85 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 4a6ebcea..a4f0001d 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-6.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
index 24467a14..9109989e 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
diff --git a/talaiot/src/test/kotlin/com/cdsap/talaiot/e2e/IntegrationSpec.kt b/talaiot/src/test/kotlin/com/cdsap/talaiot/e2e/IntegrationSpec.kt
index d2975b9c..7a65a292 100644
--- a/talaiot/src/test/kotlin/com/cdsap/talaiot/e2e/IntegrationSpec.kt
+++ b/talaiot/src/test/kotlin/com/cdsap/talaiot/e2e/IntegrationSpec.kt
@@ -12,6 +12,7 @@ import java.io.File
 class DefaultConfigurationSpec : StringSpec({
     "given default config" {
         forAll(listOf(
+            "6.4.1",
             "6.2.1",
             "6.0.1",
             "5.6.4",
diff --git a/talaiot/src/test/kotlin/com/cdsap/talaiot/metrics/DefaultBuildDataProviderTest.kt b/talaiot/src/test/kotlin/com/cdsap/talaiot/metrics/DefaultBuildDataProviderTest.kt
index 65480ac9..da14b6da 100644
--- a/talaiot/src/test/kotlin/com/cdsap/talaiot/metrics/DefaultBuildDataProviderTest.kt
+++ b/talaiot/src/test/kotlin/com/cdsap/talaiot/metrics/DefaultBuildDataProviderTest.kt
@@ -36,9 +36,9 @@ class DefaultBuildMetricsProviderTest : BehaviorSpec({
                     "buildId" to "12",
                     "buildInvocationId" to "123",
                     "osVersion" to "Linux 1.4",
-                    "maxWorkers" to 2,
+                    "maxWorkers" to 2.toInt(),
                     "javaRuntime" to "1.2",
-                    "cpuCount" to 4,
+                    "cpuCount" to 4.toInt(),
                     "locale" to "EN-us",
                     "username" to "user",
                     "publicIp" to "127.0.0.1",