diff --git a/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java b/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
index 592b02cb0ad..8a91f9e651e 100644
--- a/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
+++ b/core/src/main/java/org/testcontainers/containers/DockerMcpGatewayContainer.java
@@ -20,9 +20,13 @@
  */
 public class DockerMcpGatewayContainer extends GenericContainer<DockerMcpGatewayContainer> {
 
-    private static final String DOCKER_AGENT_GATEWAY_IMAGE = "docker/agents_gateway";
+    private static final String DOCKER_MCP_GATEWAY_IMAGE = "docker/mcp-gateway";
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(DOCKER_AGENT_GATEWAY_IMAGE);
+    private static final String DOCKER_AGENTS_GATEWAY_IMAGE = "docker/agents_gateway";
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse(DOCKER_MCP_GATEWAY_IMAGE);
+
+    private static final DockerImageName DOCKER_AGENTS_IMAGE_NAME = DockerImageName.parse(DOCKER_AGENTS_GATEWAY_IMAGE);
 
     private static final int DEFAULT_PORT = 8811;
 
@@ -40,7 +44,7 @@ public DockerMcpGatewayContainer(String dockerImageName) {
 
     public DockerMcpGatewayContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DOCKER_AGENTS_IMAGE_NAME);
         withExposedPorts(DEFAULT_PORT);
         withFileSystemBind(DockerClientFactory.instance().getRemoteDockerUnixSocketPath(), "/var/run/docker.sock");
         waitingFor(Wait.forLogMessage(".*Start sse server on port.*", 1));
diff --git a/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java b/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
index ab9305cdcfd..28e4cf6fb6a 100644
--- a/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
+++ b/core/src/test/java/org/testcontainers/containers/DockerMcpGatewayContainerTest.java
@@ -10,7 +10,7 @@ public class DockerMcpGatewayContainerTest {
 
     @Test
     public void serviceSuccessfullyStarts() {
-        try (DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/agents_gateway:v2")) {
+        try (DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/mcp-gateway:latest")) {
             gateway.start();
 
             assertThat(gateway.isRunning()).isTrue();
@@ -21,7 +21,7 @@ public void serviceSuccessfullyStarts() {
     public void gatewayStartsWithServers() {
         try (
             // container {
-            DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/agents_gateway:v2")
+            DockerMcpGatewayContainer gateway = new DockerMcpGatewayContainer("docker/mcp-gateway:latest")
                 .withServer("curl", "curl")
                 .withServer("brave", "brave_local_search", "brave_web_search")
                 .withServer("github-official", Collections.singletonList("add_issue_comment"))