diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle
index 1bd34a6a10d..b3cfd6103bd 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/build.gradle
@@ -19,7 +19,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
   testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
   testImplementation 'software.amazon.awssdk:dynamodb:2.30.22'
-  testImplementation 'org.testcontainers:localstack:1.20.1'
+  testImplementation libs.testcontainers.localstack
 
   latestDepTestImplementation group: 'software.amazon.awssdk', name: 'dynamodb', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle
index 8a2014530ba..66d39617239 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-eventbridge-2.0/build.gradle
@@ -22,7 +22,7 @@ dependencies {
   // SQS and SNS are used to act as the "targets" of the EB bus.
   testImplementation 'software.amazon.awssdk:sqs:2.27.23'
   testImplementation 'software.amazon.awssdk:sns:2.27.23'
-  testImplementation 'org.testcontainers:localstack:1.20.1'
+  testImplementation libs.testcontainers.localstack
 
   latestDepTestImplementation group: 'software.amazon.awssdk', name: 'eventbridge', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle
index c9f0516360a..bf6427bcd06 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-s3-2.0/build.gradle
@@ -19,7 +19,7 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
   testImplementation 'software.amazon.awssdk:s3:2.29.26'
-  testImplementation 'org.testcontainers:localstack:1.20.1'
+  testImplementation libs.testcontainers.localstack
 
   latestDepTestImplementation group: 'software.amazon.awssdk', name: 's3', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle
index 5c55f3f008d..028ee6efa91 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/build.gradle
@@ -44,8 +44,7 @@ dependencies {
   testImplementation group: 'software.amazon.awssdk', name: 'kinesis', version: '2.2.0'
   testImplementation group: 'org.eclipse.jetty.http2', name: 'http2-server', version: '9.4.56.v20240826'
 
-
-  testImplementation group: 'org.testcontainers', name: 'localstack', version: libs.versions.testcontainers.get()
+  testImplementation libs.testcontainers.localstack
 
   // First version where dsm traced operations have required StreamARN parameter for kinesis
   // and publishBatch is available for SNS
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle
index f7783907e12..c508d19de1c 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle
@@ -23,7 +23,7 @@ dependencies {
   // SQS is used to act as the "Subscriber" of the SNS topic.
   // There's a problem with sqs sdk v1 with localstack+testcontainers testing. so use sdk v2 for sqs
   testImplementation 'software.amazon.awssdk:sqs:2.25.40'
-  testImplementation group: 'org.testcontainers', name: 'localstack', version: libs.versions.testcontainers.get()
+  testImplementation libs.testcontainers.localstack
 
   latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-sns', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle
index 2f573019b57..8d8378f3e2a 100644
--- a/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle
+++ b/dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/build.gradle
@@ -22,7 +22,7 @@ dependencies {
   testImplementation 'software.amazon.awssdk:sns:2.25.40'
   // SQS is used to act as the "Subscriber" of the SNS topic.
   testImplementation 'software.amazon.awssdk:sqs:2.25.40'
-  testImplementation group: 'org.testcontainers', name: 'localstack', version: libs.versions.testcontainers.get()
+  testImplementation libs.testcontainers.localstack
 
   latestDepTestImplementation group: 'software.amazon.awssdk', name: 'sns', version: '+'
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 929bb806573..cfbf4e6f554 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ commons = "3.2"
 mockito = '4.4.0'
 jctools = '3.3.0'
 moshi = '1.11.0'
-testcontainers = '1.20.1'
+testcontainers = '1.21.3'
 jmc = "8.1.0"
 autoservice = "1.1.1"
 ddprof = "1.32.0"
@@ -80,6 +80,7 @@ byte-buddy = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }
 byte-buddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "bytebuddy" }
 
 testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
+testcontainers-localstack = { module = "org.testcontainers:localstack", version.ref = "testcontainers" }
 
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" }