diff --git a/connector/build.gradle.kts b/connector/build.gradle.kts
index 8465b7ca2..17914bcbd 100644
--- a/connector/build.gradle.kts
+++ b/connector/build.gradle.kts
@@ -6,6 +6,8 @@ plugins {
 
 val edcVersion: String by project
 val edcGroup: String by project
+val jettyVersion: String by project
+val jettyGroup: String by project
 
 dependencies {
     // Control-Plane
@@ -14,9 +16,24 @@ dependencies {
     implementation("${edcGroup}:api-observability:${edcVersion}")
     implementation("${edcGroup}:configuration-filesystem:${edcVersion}")
     implementation("${edcGroup}:control-plane-aggregate-services:${edcVersion}")
-    implementation("${edcGroup}:http:${edcVersion}")
+    implementation("${edcGroup}:http:${edcVersion}") {
+        exclude(group = "org.eclipse.jetty", module = "jetty-client")
+        exclude(group = "org.eclipse.jetty", module = "jetty-http")
+        exclude(group = "org.eclipse.jetty", module = "jetty-io")
+        exclude(group = "org.eclipse.jetty", module = "jetty-server")
+        exclude(group = "org.eclipse.jetty", module = "jetty-util")
+        exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
+    }
     implementation("${edcGroup}:ids:${edcVersion}")
 
+    // Updated jetty versions for e.g. CVE-2023-26048
+    implementation("${jettyGroup}:jetty-client:${jettyVersion}")
+    implementation("${jettyGroup}:jetty-http:${jettyVersion}")
+    implementation("${jettyGroup}:jetty-io:${jettyVersion}")
+    implementation("${jettyGroup}:jetty-server:${jettyVersion}")
+    implementation("${jettyGroup}:jetty-util:${jettyVersion}")
+    implementation("${jettyGroup}:jetty-webapp:${jettyVersion}")
+
     // Control-plane to Data-plane
     implementation("${edcGroup}:transfer-data-plane:${edcVersion}")
     implementation("${edcGroup}:data-plane-selector-core:${edcVersion}")
diff --git a/extensions/edc-ui-config/build.gradle.kts b/extensions/edc-ui-config/build.gradle.kts
index 42430ad93..1961fdffd 100644
--- a/extensions/edc-ui-config/build.gradle.kts
+++ b/extensions/edc-ui-config/build.gradle.kts
@@ -1,6 +1,8 @@
 val edcVersion: String by project
 val edcGroup: String by project
 val restAssured: String by project
+val jettyVersion: String by project
+val jettyGroup: String by project
 
 plugins {
     `java-library`
@@ -18,7 +20,23 @@ dependencies {
 
     testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
     testImplementation("${edcGroup}:junit:${edcVersion}")
-    testImplementation("${edcGroup}:http:${edcVersion}")
+    testImplementation("${edcGroup}:http:${edcVersion}") {
+        exclude(group = "org.eclipse.jetty", module = "jetty-client")
+        exclude(group = "org.eclipse.jetty", module = "jetty-http")
+        exclude(group = "org.eclipse.jetty", module = "jetty-io")
+        exclude(group = "org.eclipse.jetty", module = "jetty-server")
+        exclude(group = "org.eclipse.jetty", module = "jetty-util")
+        exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
+    }
+
+    // Updated jetty versions for e.g. CVE-2023-26048
+    testImplementation("${jettyGroup}:jetty-client:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-http:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-io:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-server:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-util:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-webapp:${jettyVersion}")
+
     testImplementation("io.rest-assured:rest-assured:${restAssured}")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
diff --git a/extensions/last-commit-info/build.gradle.kts b/extensions/last-commit-info/build.gradle.kts
index c0e3f9671..1495ffe75 100644
--- a/extensions/last-commit-info/build.gradle.kts
+++ b/extensions/last-commit-info/build.gradle.kts
@@ -1,6 +1,8 @@
 val edcVersion: String by project
 val edcGroup: String by project
 val restAssured: String by project
+val jettyVersion: String by project
+val jettyGroup: String by project
 
 plugins {
     `java-library`
@@ -24,7 +26,23 @@ dependencies {
 
     testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
     testImplementation("${edcGroup}:junit:${edcVersion}")
-    testImplementation("${edcGroup}:http:${edcVersion}")
+    testImplementation("${edcGroup}:http:${edcVersion}") {
+        exclude(group = "org.eclipse.jetty", module = "jetty-client")
+        exclude(group = "org.eclipse.jetty", module = "jetty-http")
+        exclude(group = "org.eclipse.jetty", module = "jetty-io")
+        exclude(group = "org.eclipse.jetty", module = "jetty-server")
+        exclude(group = "org.eclipse.jetty", module = "jetty-util")
+        exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
+    }
+
+    // Updated jetty versions for e.g. CVE-2023-26048
+    testImplementation("${jettyGroup}:jetty-client:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-http:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-io:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-server:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-util:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-webapp:${jettyVersion}")
+
     testImplementation("io.rest-assured:rest-assured:${restAssured}")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
diff --git a/extensions/wrapper/client/build.gradle.kts b/extensions/wrapper/client/build.gradle.kts
index 33d4bd688..7ed2c6c8d 100644
--- a/extensions/wrapper/client/build.gradle.kts
+++ b/extensions/wrapper/client/build.gradle.kts
@@ -2,6 +2,8 @@ val edcVersion: String by project
 val edcGroup: String by project
 val restAssured: String by project
 val assertj: String by project
+val jettyVersion: String by project
+val jettyGroup: String by project
 
 
 plugins {
@@ -40,7 +42,23 @@ dependencies {
 
     testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
     testImplementation("${edcGroup}:junit:${edcVersion}")
-    testImplementation("${edcGroup}:http:${edcVersion}")
+    testImplementation("${edcGroup}:http:${edcVersion}") {
+        exclude(group = "org.eclipse.jetty", module = "jetty-client")
+        exclude(group = "org.eclipse.jetty", module = "jetty-http")
+        exclude(group = "org.eclipse.jetty", module = "jetty-io")
+        exclude(group = "org.eclipse.jetty", module = "jetty-server")
+        exclude(group = "org.eclipse.jetty", module = "jetty-util")
+        exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
+    }
+
+    // Updated jetty versions for e.g. CVE-2023-26048
+    testImplementation("${jettyGroup}:jetty-client:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-http:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-io:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-server:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-util:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-webapp:${jettyVersion}")
+
     testImplementation(project(":extensions:wrapper:wrapper"))
     testImplementation("io.rest-assured:rest-assured:${restAssured}")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
diff --git a/extensions/wrapper/wrapper/build.gradle.kts b/extensions/wrapper/wrapper/build.gradle.kts
index e5e8e8b09..4a994e635 100644
--- a/extensions/wrapper/wrapper/build.gradle.kts
+++ b/extensions/wrapper/wrapper/build.gradle.kts
@@ -2,6 +2,8 @@ val edcVersion: String by project
 val edcGroup: String by project
 val restAssured: String by project
 val assertj: String by project
+val jettyVersion: String by project
+val jettyGroup: String by project
 
 plugins {
     `java-library`
@@ -37,7 +39,23 @@ dependencies {
 
     testImplementation("${edcGroup}:control-plane-core:${edcVersion}")
     testImplementation("${edcGroup}:junit:${edcVersion}")
-    testImplementation("${edcGroup}:http:${edcVersion}")
+    testImplementation("${edcGroup}:http:${edcVersion}") {
+        exclude(group = "org.eclipse.jetty", module = "jetty-client")
+        exclude(group = "org.eclipse.jetty", module = "jetty-http")
+        exclude(group = "org.eclipse.jetty", module = "jetty-io")
+        exclude(group = "org.eclipse.jetty", module = "jetty-server")
+        exclude(group = "org.eclipse.jetty", module = "jetty-util")
+        exclude(group = "org.eclipse.jetty", module = "jetty-webapp")
+    }
+
+    // Updated jetty versions for e.g. CVE-2023-26048
+    testImplementation("${jettyGroup}:jetty-client:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-http:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-io:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-server:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-util:${jettyVersion}")
+    testImplementation("${jettyGroup}:jetty-webapp:${jettyVersion}")
+
     testImplementation(project(":extensions:policy-always-true"))
     testImplementation("io.rest-assured:rest-assured:${restAssured}")
     testImplementation("org.assertj:assertj-core:${assertj}")
diff --git a/gradle.properties b/gradle.properties
index e4ad48c30..abbc1a59f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,9 +9,11 @@ assertj=3.23.1
 jupiterVersion=5.8.2
 mockitoVersion=4.8.0
 okHttpVersion=4.10.0
-jsonVersion=20220924
+jsonVersion=20230618
 restAssured=4.5.0
 flywayVersion=9.0.1
 postgresVersion=42.4.0
+jettyGroup=org.eclipse.jetty
+jettyVersion=11.0.15
 
 org.gradle.jvmargs=-Xmx1024m