diff --git a/CHANGELOG.md b/CHANGELOG.md
index daa88da..9a4948b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.4.0
+* Update to Testcontainers v2
+
 # 2.3.0
 * Use Virtual Threads on Java 21+
 * Minor optimizations
diff --git a/pom.xml b/pom.xml
index a9968a6..228f702 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>testcontainers-advanced-imagebuilder-root</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -46,7 +46,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>11.1.0</version>
+								<version>12.0.1</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -71,7 +71,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.27.0</version>
+						<version>3.28.0</version>
 						<configuration>
 							<analysisCache>true</analysisCache>
 							<includeTests>true</includeTests>
diff --git a/testcontainers-advanced-imagebuilder-demo/Dockerfile b/testcontainers-advanced-imagebuilder-demo/Dockerfile
index 4cd5317..768a2e0 100644
--- a/testcontainers-advanced-imagebuilder-demo/Dockerfile
+++ b/testcontainers-advanced-imagebuilder-demo/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1-labs
 # Stage 1: Build the dummy app
-ARG JAVA_VERSION=21
+ARG JAVA_VERSION=25
 FROM eclipse-temurin:$JAVA_VERSION-jdk-alpine AS build-env
 
 RUN apk add --no-cache bash
@@ -26,7 +26,7 @@ RUN echo "Executing '$MAVEN_BUILD_COMMAND'"
 RUN ${MAVEN_BUILD_COMMAND}
 
 # Stage 2: Build the executable image
-FROM eclipse-temurin:21-jre-alpine
+FROM eclipse-temurin:$JAVA_VERSION-jre-alpine
 
 ARG user=dummy-app
 ARG group=dummy-app
diff --git a/testcontainers-advanced-imagebuilder-demo/pom.xml b/testcontainers-advanced-imagebuilder-demo/pom.xml
index c1d71f7..34b884d 100644
--- a/testcontainers-advanced-imagebuilder-demo/pom.xml
+++ b/testcontainers-advanced-imagebuilder-demo/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>testcontainers-advanced-imagebuilder-root</artifactId>
-		<version>2.3.1-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>testcontainers-advanced-imagebuilder-demo</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
diff --git a/testcontainers-advanced-imagebuilder-dummy-app/pom.xml b/testcontainers-advanced-imagebuilder-dummy-app/pom.xml
index 6cf2f14..06e6159 100644
--- a/testcontainers-advanced-imagebuilder-dummy-app/pom.xml
+++ b/testcontainers-advanced-imagebuilder-dummy-app/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>testcontainers-advanced-imagebuilder-dummy-app</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
@@ -82,7 +82,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>11.1.0</version>
+								<version>12.0.1</version>
 							</dependency>
 						</dependencies>
 						<configuration>
diff --git a/testcontainers-advanced-imagebuilder/pom.xml b/testcontainers-advanced-imagebuilder/pom.xml
index 4a6886d..157d11d 100644
--- a/testcontainers-advanced-imagebuilder/pom.xml
+++ b/testcontainers-advanced-imagebuilder/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>testcontainers-advanced-imagebuilder</artifactId>
-	<version>2.3.1-SNAPSHOT</version>
+	<version>2.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>testcontainers-advanced-imagebuilder</name>
@@ -56,19 +56,7 @@
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
-			<version>1.21.3</version>
-			<exclusions>
-				<!-- No JUnit 4 -->
-				<exclusion>
-					<groupId>junit</groupId>
-					<artifactId>junit</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>software.xdev</groupId>
-			<artifactId>testcontainers-junit4-mock</artifactId>
-			<version>1.0.2</version>
+			<version>2.0.0</version>
 		</dependency>
 		<!-- Testcontainers is using outdated v1 -->
 		<dependency>
@@ -77,6 +65,14 @@
 			<version>2.0.17</version>
 		</dependency>
 
+		<!-- Explicitly declared to prevent incompatibilities -->
+		<!-- Original comes transitively from Testcontainers -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.20.0</version>
+		</dependency>
+
 		<!-- Tests -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
@@ -295,7 +291,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>11.1.0</version>
+								<version>12.0.1</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -320,7 +316,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.27.0</version>
+						<version>3.28.0</version>
 						<configuration>
 							<analysisCache>true</analysisCache>
 							<includeTests>true</includeTests>
diff --git a/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/AdvancedImageFromDockerFile.java b/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/AdvancedImageFromDockerFile.java
index c28af4f..5cc27e8 100644
--- a/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/AdvancedImageFromDockerFile.java
+++ b/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/AdvancedImageFromDockerFile.java
@@ -43,6 +43,8 @@
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.function.TriFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
@@ -53,8 +55,6 @@
 import org.testcontainers.images.builder.traits.DockerfileTrait;
 import org.testcontainers.images.builder.traits.FilesTrait;
 import org.testcontainers.images.builder.traits.StringsTrait;
-import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
-import org.testcontainers.shaded.org.apache.commons.lang3.function.TriFunction;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerLoggerFactory;
diff --git a/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/DefaultTransferFilesCreator.java b/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/DefaultTransferFilesCreator.java
index c23aa64..ad68800 100644
--- a/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/DefaultTransferFilesCreator.java
+++ b/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/DefaultTransferFilesCreator.java
@@ -39,10 +39,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 import software.xdev.testcontainers.imagebuilder.jgit.ignore.FastIgnoreRule;
 import software.xdev.testcontainers.imagebuilder.jgit.ignore.IgnoreNode;
@@ -177,7 +177,7 @@ protected static Stream<Path> findFiles(
 			: Files.find(start, maxDepth, matcher, options);
 	}
 	
-	@SuppressWarnings("java:S2789")
+	@SuppressWarnings({"java:S2789", "OptionalAssignedToNull"})
 	protected Map.Entry<Path, String> determineFileForTransfer(
 		final IgnoreNode ignoreNode,
 		final Set<String> alwaysIncludedRelativePaths,
@@ -213,7 +213,7 @@ protected Map.Entry<Path, String> determineFileForTransfer(
 		return outcomeDirs;
 	}
 	
-	@SuppressWarnings("java:S2789")
+	@SuppressWarnings({"java:S2789", "OptionalAssignedToNull"})
 	protected Map.Entry<Path, String> determineParentDirectoryForTransfer(
 		final IgnoreNode ignoreNode,
 		final Set<String> alwaysIncludedRelativePaths,
@@ -261,7 +261,7 @@ protected String parentDirectory(final String dir)
 			: null;
 	}
 	
-	@SuppressWarnings("java:S2789")
+	@SuppressWarnings({"java:S2789", "OptionalAssignedToNull"})
 	protected Optional<Map.Entry<Path, String>> shouldIgnore(
 		final IgnoreNode ignoreNode,
 		final Set<String> alwaysIncludedRelativePaths,
diff --git a/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/TransferArchiveTARCompressor.java b/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/TransferArchiveTARCompressor.java
index 01cf54e..0ef3964 100644
--- a/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/TransferArchiveTARCompressor.java
+++ b/testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/TransferArchiveTARCompressor.java
@@ -30,8 +30,8 @@
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
-import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 
 import software.xdev.testcontainers.imagebuilder.transfer.fcm.FileContentModifier;