diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc
index ea0400bdf5..ffa626e6e1 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc
@@ -1072,7 +1072,7 @@ include::code:test/MyContainersConfiguration[]
 NOTE: The lifecycle of `Container` beans is automatically managed by Spring Boot.
 Containers will be started and stopped automatically.
 
-TIP: You can use the configprop:spring.testcontainers.startup[] property to change how containers are started.
+TIP: You can use the configprop:spring.testcontainers.beans.startup[] property to change how containers are started.
 By default `sequential` startup is used, but you may also choose `parallel` if you wish to start multiple containers in parallel.
 
 Once you have defined your test configuration, you can use the `with(...)` method to attach it to your test launcher:
diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersStartup.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersStartup.java
index 4554dbc83b..00009a07fa 100644
--- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersStartup.java
+++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersStartup.java
@@ -61,7 +61,7 @@ public enum TestcontainersStartup {
 	 * The {@link Environment} property used to change the {@link TestcontainersStartup}
 	 * strategy.
 	 */
-	public static final String PROPERTY = "spring.testcontainers.startup";
+	public static final String PROPERTY = "spring.testcontainers.beans.startup";
 
 	abstract void start(Collection<? extends Startable> startables);
 
diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 708bb78549..ca82e22875 100644
--- a/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,7 +1,7 @@
 {
   "properties": [
     {
-      "name": "spring.testcontainers.startup",
+      "name": "spring.testcontainers.beans.startup",
       "type": "org.springframework.boot.testcontainers.lifecycle.TestcontainersStartup",
        "description": "Testcontainers startup modes.",
        "defaultValue": "sequential"
diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleApplicationContextInitializerTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleApplicationContextInitializerTests.java
index dca0b39d1d..a00c0da51d 100644
--- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleApplicationContextInitializerTests.java
+++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleApplicationContextInitializerTests.java
@@ -114,7 +114,7 @@ class TestcontainersLifecycleApplicationContextInitializerTests {
 		AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
 		applicationContext.getEnvironment()
 			.getPropertySources()
-			.addLast(new MapPropertySource("test", Map.of("spring.testcontainers.startup", "parallel")));
+			.addLast(new MapPropertySource("test", Map.of("spring.testcontainers.beans.startup", "parallel")));
 		new TestcontainersLifecycleApplicationContextInitializer().initialize(applicationContext);
 		AbstractBeanFactory beanFactory = (AbstractBeanFactory) applicationContext.getBeanFactory();
 		BeanPostProcessor beanPostProcessor = beanFactory.getBeanPostProcessors()
diff --git a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersStartupTests.java b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersStartupTests.java
index fd88210cca..848ece5802 100644
--- a/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersStartupTests.java
+++ b/spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersStartupTests.java
@@ -82,7 +82,7 @@ class TestcontainersStartupTests {
 		MockEnvironment environment = new MockEnvironment();
 		assertThatIllegalArgumentException()
 			.isThrownBy(() -> TestcontainersStartup.get(environment.withProperty(PROPERTY, "bad")))
-			.withMessage("Unknown 'spring.testcontainers.startup' property value 'bad'");
+			.withMessage("Unknown 'spring.testcontainers.beans.startup' property value 'bad'");
 	}
 
 	private List<TestStartable> createTestStartables(int size) {