diff --git a/docs/modules/mockserver.md b/docs/modules/mockserver.md
index e6a0ee91ece..8375f005c5f 100644
--- a/docs/modules/mockserver.md
+++ b/docs/modules/mockserver.md
@@ -1,5 +1,14 @@
 # Mockserver Module
 
+!!! note "Deprecated — use the MockServer-maintained module for new projects"
+    This bundled module is deprecated. For new projects, prefer the MockServer-maintained
+    module [`org.mock-server:mockserver-testcontainers`](https://www.mock-server.com/mock_server/mockserver_testcontainers.html)
+    (class `org.mockserver.testcontainers.MockServerContainer`). It tracks current MockServer
+    releases, derives its image tag from the client library so the container and client stay in
+    lockstep, and adds configuration helpers (DNS, transparent proxy, HTTP/3, initialization JSON,
+    log level, arbitrary properties) plus direct `MockServerClient` wiring. This page documents the
+    legacy bundled module.
+
 Mock Server can be used to mock HTTP services by matching requests against user-defined expectations.
 
 ## Usage example
diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
index 47d2399d934..63666527ce9 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java
@@ -5,7 +5,13 @@
 import org.testcontainers.utility.DockerImageName;
 
 /**
- * @deprecated use {@link org.testcontainers.mockserver.MockServerContainer} instead.
+ * @deprecated Use the MockServer-maintained module instead:
+ * {@code org.mock-server:mockserver-testcontainers}
+ * (class {@code org.mockserver.testcontainers.MockServerContainer}). It tracks current MockServer
+ * releases, derives its image tag from the client library so the two stay in lockstep, and adds
+ * configuration helpers (DNS, transparent proxy, HTTP/3, initialization JSON, log level, arbitrary
+ * properties) plus direct {@code MockServerClient} wiring. See
+ * https://www.mock-server.com/mock_server/mockserver_testcontainers.html
  */
 @Slf4j
 @Deprecated
diff --git a/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java
index cbfcbc9fd66..3373cb4dd1c 100644
--- a/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java
+++ b/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java
@@ -5,12 +5,22 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
+/**
+ * @deprecated Use the MockServer-maintained module instead:
+ * {@code org.mock-server:mockserver-testcontainers}
+ * (class {@code org.mockserver.testcontainers.MockServerContainer}). It tracks current MockServer
+ * releases, derives its image tag from the client library so the two stay in lockstep, and adds
+ * configuration helpers (DNS, transparent proxy, HTTP/3, initialization JSON, log level, arbitrary
+ * properties) plus direct {@code MockServerClient} wiring. See
+ * https://www.mock-server.com/mock_server/mockserver_testcontainers.html
+ */
 @Slf4j
+@Deprecated
 public class MockServerContainer extends GenericContainer<MockServerContainer> {
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("jamesdbloom/mockserver");
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mockserver/mockserver");
 
-    private static final String DEFAULT_TAG = "mockserver-5.5.4";
+    private static final String DEFAULT_TAG = "mockserver-7.0.0";
 
     @Deprecated
     public static final String VERSION = DEFAULT_TAG;