diff --git a/.gitignore b/.gitignore
index 65f2916..04dacd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ gradle/
 
 **/.gradle
 **/build
+.DS_Store
diff --git a/build.gradle.kts b/build.gradle.kts
index dc38039..4a1b909 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
     `java-library`
     `maven-publish`
-    `kotlin-dsl`
     pmd
     checkstyle
     jacoco
@@ -12,12 +11,11 @@ plugins {
 val springVersion = "3.2.2";
 
 dependencies {
-    api("com.knecon.fforesight:tenant-commons:0.26.0")
+    api("com.knecon.fforesight:tenant-commons:0.31.0")
     api("org.springframework.boot:spring-boot-starter-oauth2-resource-server:${springVersion}")
     api("org.springframework.boot:spring-boot-starter-security:${springVersion}")
     api("org.springframework.boot:spring-boot-starter-web:${springVersion}")
     api("org.springframework.boot:spring-boot-configuration-processor:${springVersion}")
-    api("org.projectlombok:lombok:1.18.30")
     testImplementation("org.springframework.boot:spring-boot-starter-test:${springVersion}")
 }
 
@@ -81,7 +79,7 @@ tasks.named<Test>("test") {
 
 sonarqube {
     properties {
-        property("sonar.login", providers.gradleProperty("sonarToken").getOrNull())
+        providers.gradleProperty("sonarToken").getOrNull()?.let { property("sonar.login", it) }
         property("sonar.host.url", "https://sonarqube.knecon.com")
     }
 }
@@ -101,4 +99,4 @@ tasks.jacocoTestReport {
 
 java {
     withJavadocJar()
-}
\ No newline at end of file
+}