diff --git a/apps/bfd-db-migrator/pom.xml b/apps/bfd-db-migrator/pom.xml
index 7b06810d8e..c263d3d0c7 100644
--- a/apps/bfd-db-migrator/pom.xml
+++ b/apps/bfd-db-migrator/pom.xml
@@ -136,13 +136,13 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>localstack</artifactId>
+            <artifactId>testcontainers-localstack</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/apps/bfd-server-ng/pom.xml b/apps/bfd-server-ng/pom.xml
index d1d14fdcd9..3b9e67b01c 100644
--- a/apps/bfd-server-ng/pom.xml
+++ b/apps/bfd-server-ng/pom.xml
@@ -102,7 +102,7 @@
 
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
@@ -126,7 +126,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
+            <artifactId>testcontainers-postgresql</artifactId>
             <version>${testcontainers.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/apps/bfd-shared-test-utils/pom.xml b/apps/bfd-shared-test-utils/pom.xml
index 3976f549bd..b0eb1eca0d 100644
--- a/apps/bfd-shared-test-utils/pom.xml
+++ b/apps/bfd-shared-test-utils/pom.xml
@@ -77,17 +77,17 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <version>${testcontainers.version}</version>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>localstack</artifactId>
+            <artifactId>testcontainers-localstack</artifactId>
             <version>${testcontainers.version}</version>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
+            <artifactId>testcontainers-postgresql</artifactId>
             <version>${testcontainers.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/apps/bfd-shared-test-utils/src/main/java/gov/cms/bfd/FileBasedAssertionHelper.java b/apps/bfd-shared-test-utils/src/main/java/gov/cms/bfd/FileBasedAssertionHelper.java
index ccacdb5fd9..9bfa1dba86 100644
--- a/apps/bfd-shared-test-utils/src/main/java/gov/cms/bfd/FileBasedAssertionHelper.java
+++ b/apps/bfd-shared-test-utils/src/main/java/gov/cms/bfd/FileBasedAssertionHelper.java
@@ -48,7 +48,6 @@ public FileBasedAssertionHelper(Path fileForTest) {
    * @param truncateFile true causes file to be truncated (set to 0 length)
    * @param maxWaitSeconds maximum amount of time to wait for lock
    * @throws InterruptedException lock acquisition interrupted
-   * @throws junit.framework.AssertionFailedError lock acquisition timed out
    * @throws IOException file truncation failed
    */
   public void beginTest(boolean truncateFile, long maxWaitSeconds)
diff --git a/apps/bfd-shared-utils/pom.xml b/apps/bfd-shared-utils/pom.xml
index 32f2818268..e74e9723af 100644
--- a/apps/bfd-shared-utils/pom.xml
+++ b/apps/bfd-shared-utils/pom.xml
@@ -162,13 +162,13 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers-junit-jupiter</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>localstack</artifactId>
+            <artifactId>testcontainers-localstack</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/apps/pom.xml b/apps/pom.xml
index 4ca0c74901..6fd92f8f62 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -136,8 +136,8 @@
         <hibernate.version>6.4.4.Final</hibernate.version>
         <junit.version>5.12.0</junit.version>
         <junit.platform.version>1.12.0</junit.platform.version>
-        <javadoc.version>3.11.2</javadoc.version>
-        <testcontainers.version>1.19.3</testcontainers.version>
+        <javadoc.version>3.12.0</javadoc.version>
+        <testcontainers.version>2.0.1</testcontainers.version>
 
         <!-- Jackson versions should be kept in sync when possible but can diverge slightly
             when vulnerabilities or other fixes affect some but not all components -->
@@ -172,7 +172,7 @@
             The version used here should be compatible with SLF4J.
             See the compatible versions here: https://www.slf4j.org/manual.html
         -->
-        <logback.core.version>1.5.15</logback.core.version>
+        <logback.core.version>1.5.19</logback.core.version>
         <zjsonpatch.version>0.4.16</zjsonpatch.version>
         <freemarker.version>2.3.32</freemarker.version>
         <reflections.version>0.10.2</reflections.version>
@@ -222,8 +222,8 @@
         <!-- Note: See gov.cms.bfd.model.rif.schema.DatabaseTestHelper for details
             on the default 'jdbc:bfd-test:' URL here. -->
         <its.db.url>jdbc:bfd-test:tc</its.db.url>
-        <its.db.username />
-        <its.db.password />
+        <its.db.username/>
+        <its.db.password/>
         <!-- Docker image used with testcontainers to provide a working database for testing. -->
         <!-- This has a default value in gov.cms.bfd.DatabaseTestUtils that must also be changed
         when changing this property. -->
@@ -264,7 +264,7 @@
         <!-- Additional image tag for images built by jib.  (e.g. release number or commit hash)-->
         <jib.tag>${project.version}</jib.tag>
         <!-- Optional image namespace. -->
-        <jib.namespace />
+        <jib.namespace/>
         <!-- Skip by default.  Override to allow images to be built. -->
         <jib.skip>true</jib.skip>