diff --git a/Dockerfile b/Dockerfile
index 12db0eb0c..abb13e189 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,9 +44,10 @@ COPY --from=builder /binaries/cagent-$TARGETOS-$TARGETARCH cagent
 FROM scratch AS cross
 COPY --from=builder /binaries .
 
-FROM alpine:3.22@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
-RUN apk add --no-cache curl socat
-ARG TARGETOS TARGETARCH
-COPY --from=builder /binaries/cagent-$TARGETOS-$TARGETARCH /cagent
+FROM docker:cli
 RUN mkdir /data
+ARG TARGETOS TARGETARCH
+ENV DOCKER_MCP_IN_CONTAINER=1
 ENTRYPOINT ["/cagent"]
+COPY --from=docker/mcp-gateway:v2 /docker-mcp /usr/local/lib/docker/cli-plugins/
+COPY --from=builder /binaries/cagent-$TARGETOS-$TARGETARCH /cagent
diff --git a/Taskfile.yml b/Taskfile.yml
index 7c901c349..db0b1e249 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -67,11 +67,11 @@ tasks:
 
   build-image:
     desc: Build Docker image
-    cmd: docker buildx build -t docker/cagent:latest {{.BUILD_ARGS}} .
+    cmd: docker buildx build -t docker/cagent:v1.4 {{.BUILD_ARGS}} .
 
   push-image:
     desc: Build and Push Docker image
-    cmd: docker buildx build --push -t docker/cagent:latest {{.BUILD_ARGS}} .
+    cmd: docker buildx build --push -t docker/cagent:v1.4 {{.BUILD_ARGS}} .
 
   build-agents:
     desc: Build Demo dockerized agents
diff --git a/pkg/oci/Dockerfile.template b/pkg/oci/Dockerfile.template
index c333114e1..831a37a16 100644
--- a/pkg/oci/Dockerfile.template
+++ b/pkg/oci/Dockerfile.template
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM docker/cagent
+FROM docker/cagent:v1.4
 LABEL com.docker.agent.mcp-servers="{{ .McpServers }}"
 LABEL com.docker.agent.models="{{ .Models }}"
 LABEL com.docker.agent.packaging.version="v0.0.1"