diff --git a/.cirrus.yml b/.cirrus.yml
index bb8afd86..3a76f0ca 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -32,13 +32,21 @@ linux_2_cpu_4G_template: &LINUX_2_CPU_4G
     cpu: 2
     memory: 4G
 
-linux_4_cpu_6G_java_17_template: &LINUX_4_CPU_6G_JAVA_17
+linux_4_cpu_container_template: &LINUX_4_CPU
+  <<: *LINUX_IMAGE
+  image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-g7-latest
+  cpu: 4
+
+linux_4_cpu_6G__template: &LINUX_4_CPU_6G
   eks_container:
-    <<: *LINUX_IMAGE
-    image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-g7-latest
-    cpu: 4
+    <<: *LINUX_4_CPU
     memory: 6G
 
+linux_4_cpu_8G_template: &LINUX_4_CPU_8G
+  eks_container:
+    <<: *LINUX_4_CPU
+    memory: 8G
+
 eks_container: &CONTAINER_DEFINITION
   image: ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-g7-latest
   cluster_name: ${CIRRUS_CLUSTER_NAME}
@@ -73,7 +81,7 @@ cleanup_gradle_cache_script_template: &CLEANUP_GRADLE_CACHE_SCRIPT
     - rm -rf "${CIRRUS_WORKING_DIR}/.gradle/caches/build-cache-1/"
 
 build_task:
-  <<: *LINUX_2_CPU_4G
+  <<: *LINUX_4_CPU_6G
   <<: *SETUP_GRADLE_CACHE
   env:
     SONAR_TOKEN: VAULT[development/kv/data/next data.token]
@@ -120,7 +128,7 @@ qa_plugin_task:
     matrix:
       - SQ_VERSION: "DEV"
       - SQ_VERSION: "LATEST_RELEASE"
-  <<: *LINUX_4_CPU_6G_JAVA_17
+  <<: *LINUX_4_CPU_8G
   <<: *GRADLE_ITS_TEMPLATE
   <<: *ON_FAILURE
 
@@ -131,7 +139,7 @@ qa_ruling_task:
     SQ_VERSION: "LATEST_RELEASE"
     GRADLE_TASK: ":its:ruling:test"
     ITS_PROJECT: "ruling"
-  <<: *LINUX_4_CPU_6G_JAVA_17
+  <<: *LINUX_4_CPU_8G
   <<: *GRADLE_ITS_TEMPLATE
   <<: *ON_FAILURE
 
diff --git a/build-logic b/build-logic
index 14a35c8a..0f118907 160000
--- a/build-logic
+++ b/build-logic
@@ -1 +1 @@
-Subproject commit 14a35c8a3ca4546308e1e638a4b0e581deacc059
+Subproject commit 0f118907e5b1a898753d8ec01e4f1f1894107edc
diff --git a/build.gradle b/build.gradle
index 71c6d374..f3c9cb44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ import java.util.jar.JarInputStream
 
 plugins {
     id 'com.jfrog.artifactory' version '4.28.2'
-    id 'org.sonarqube' version '3.5.0.2730'
+    id 'org.sonarqube' version '6.0.1.5171'
     id 'de.thetaphi.forbiddenapis' version '3.0' apply false
     id 'com.diffplug.spotless' version '6.15.0'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c7d437bb..f19a9a46 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/its/plugin/build.gradle b/its/plugin/build.gradle
index 7a9c0508..bc3e54ef 100644
--- a/its/plugin/build.gradle
+++ b/its/plugin/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testRuntimeOnly testLibs.junit.vintage.engine
 }
 
-sonarqube.skipProject = true
+sonar.skipProject = true
 
 test {
     onlyIf {
diff --git a/its/ruling/build.gradle b/its/ruling/build.gradle
index dda1c08b..a847ad92 100644
--- a/its/ruling/build.gradle
+++ b/its/ruling/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     testRuntimeOnly testLibs.junit.vintage.engine
 }
 
-sonarqube.skipProject = true
+sonar.skipProject = true
 
 test {
     onlyIf {