diff --git a/contribs/application/pom.xml b/contribs/application/pom.xml
index 546d465e7d2..f15326461c8 100644
--- a/contribs/application/pom.xml
+++ b/contribs/application/pom.xml
@@ -79,6 +79,7 @@
 			<artifactId>gtfs2matsim</artifactId>
 			<version>master-33809c4f0f-1</version>
 			<exclusions>
+				<!-- Exclude unneeded dependencies and these with known CVE -->
 				<exclusion>
 					<groupId>org.geotools</groupId>
 					<artifactId>*</artifactId>
@@ -87,6 +88,18 @@
 					<groupId>org.matsim</groupId>
 					<artifactId>*</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>com.amazonaws</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.graphql-java</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.postgresql</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
diff --git a/contribs/application/src/main/java/org/matsim/application/analysis/traffic/LinkStats.java b/contribs/application/src/main/java/org/matsim/application/analysis/traffic/LinkStats.java
index 09c3e910238..f5e2abbb323 100644
--- a/contribs/application/src/main/java/org/matsim/application/analysis/traffic/LinkStats.java
+++ b/contribs/application/src/main/java/org/matsim/application/analysis/traffic/LinkStats.java
@@ -1,6 +1,6 @@
 package org.matsim.application.analysis.traffic;
 
-import com.beust.jcommander.internal.Lists;
+import com.google.common.collect.Lists;
 import it.unimi.dsi.fastutil.doubles.DoubleArrayList;
 import it.unimi.dsi.fastutil.doubles.DoubleList;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
diff --git a/contribs/application/src/main/java/org/matsim/application/prepare/CreateLandUseShp.java b/contribs/application/src/main/java/org/matsim/application/prepare/CreateLandUseShp.java
index c2abbfe1ae3..4f10c61e745 100644
--- a/contribs/application/src/main/java/org/matsim/application/prepare/CreateLandUseShp.java
+++ b/contribs/application/src/main/java/org/matsim/application/prepare/CreateLandUseShp.java
@@ -1,6 +1,5 @@
 package org.matsim.application.prepare;
 
-import com.beust.jcommander.internal.Lists;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.geotools.data.DataStore;
@@ -24,6 +23,7 @@
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -90,7 +90,7 @@ public Integer call() throws Exception {
 			STRtree index = new STRtree();
 			boolean built = false;
 
-			List<Path> paths = Lists.newArrayList();
+			List<Path> paths =new ArrayList<>();
 			if (input.toString().endsWith("zip")) {
 				FileSystem fs = FileSystems.newFileSystem(input, ClassLoader.getSystemClassLoader());
 				for (String l : layer) {
diff --git a/contribs/simwrapper/pom.xml b/contribs/simwrapper/pom.xml
index 26bff793134..b7557529aec 100644
--- a/contribs/simwrapper/pom.xml
+++ b/contribs/simwrapper/pom.xml
@@ -38,6 +38,18 @@
 		<dependency>
 			<groupId>tech.tablesaw</groupId>
 			<artifactId>tablesaw-jsplot</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>io.pebbletemplates</groupId>
+					<artifactId>pebble</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- Pinned this version, as older one is not compatible with java 21, newer ones might be incompatible	-->
+		<dependency>
+			<groupId>io.pebbletemplates</groupId>
+			<artifactId>pebble</artifactId>
+			<version>3.1.6</version>
 		</dependency>
 
 		<dependency>