diff --git a/build.gradle b/build.gradle
index b48ed1e2ad106b2ea0a8a2e49945ff12bce4f12a..8a1ed0f07b77a854e5c4baf1f6139e3142d7687e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,10 @@ protobuf {
     }
     generateProtoTasks {
         all()*.plugins {
-            grpc {}
+            grpc {
+                option 'jakarta_omit'
+                option '@generated=omit'
+            }
         }
     }
 }
@@ -90,19 +93,19 @@ dependencies {
     implementation('org.springframework.boot:spring-boot-starter-validation')
     implementation 'org.springframework.boot:spring-boot-starter-cache'
 
-    implementation('org.springdoc:springdoc-openapi-ui:1.8.0')
-
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.security:spring-security-oauth2-jose'
     implementation 'org.springframework.security:spring-security-oauth2-client'
 
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+    implementation('org.springdoc:springdoc-openapi-ui:1.8.0')
+
     implementation('org.modelmapper:modelmapper:3.2.2')
     implementation('org.modelmapper.extensions:modelmapper-spring:3.2.2')
     implementation('org.apache.commons:commons-lang3:3.17.0')
-    //workaround for grpc using javax (https://github.com/grpc/grpc-java/issues/9179)
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
-    implementation 'javax.xml.bind:jaxb-api:2.3.1'
 
     // Database
     runtimeOnly('com.h2database:h2')
@@ -111,30 +114,29 @@ dependencies {
     implementation('org.flywaydb:flyway-core:11.2.0')
     runtimeOnly 'org.flywaydb:flyway-database-postgresql:11.2.0'
 
-    //implementation('io.jsonwebtoken:jjwt:0.9.1')
     implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.3'
 
-    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
-    implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
-    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
-
     implementation('org.freemarker:freemarker:2.3.34')
-    implementation 'org.gitlab4j:gitlab4j-api:6.0.0-rc.9' // version 6 for jakarta
+
     implementation('com.vdurmont:semver4j:3.1.0')
     implementation('io.micrometer:micrometer-registry-prometheus:1.11.12')
 
-    implementation 'ch.qos.logback:logback-core:1.5.17'
-
     // Kubernetes API client
     implementation('io.fabric8:kubernetes-client:6.13.5')
 
+    // GitLab API client
+    implementation 'org.gitlab4j:gitlab4j-api:6.0.0-rc.9' // version 6 for jakarta
+
+    // GRPC communication with Janitor
     implementation('com.google.protobuf:protobuf-java:4.30.2')
     implementation('io.grpc:grpc-netty-shaded:1.71.0')
     implementation('io.grpc:grpc-protobuf:1.71.0')
     implementation('io.grpc:grpc-stub:1.71.0')
 
+    // CSV processing
     implementation('com.opencsv:opencsv:5.9')
 
+    // Tests
     testImplementation('org.mockito:mockito-core:5.16.1')
     testImplementation('org.springframework.boot:spring-boot-starter-test')