diff --git a/Dockerfile b/Dockerfile
index c1f784bcb..068f7644d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -86,6 +86,6 @@ FROM scratch AS cross
 COPY --from=builder /binaries .
 
 FROM alpine:3.22@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
-RUN apk add --no-cache curl socat
-COPY --from=build-agent /agent /
-ENTRYPOINT [ "/agent" ]
\ No newline at end of file
+COPY --from=build-agent /agent /cagent
+RUN mkdir /data
+ENTRYPOINT ["/cagent"]
diff --git a/Taskfile.yml b/Taskfile.yml
index b141815d0..e9a3eb7b0 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -24,6 +24,7 @@ tasks:
       - go build -ldflags "{{.LDFLAGS}}" -o {{.BUILD_DIR}}/{{.BINARY_NAME}} {{.MAIN_PKG}}
     sources:
       - "{{.GO_SOURCES}}"
+      - "**/*.template"
       - "**/*.txt"
       - "go.mod"
       - "go.sum"
diff --git a/pkg/oci/Dockerfile.template b/pkg/oci/Dockerfile.template
index f54618bcd..5d995fad2 100644
--- a/pkg/oci/Dockerfile.template
+++ b/pkg/oci/Dockerfile.template
@@ -1,20 +1,14 @@
 # syntax=docker/dockerfile:1
-FROM alpine:3.22@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
-
-RUN adduser -D cagent
-ADD https://github.com/docker/cagent/releases/download/v1.0.9/cagent-linux-arm64 /cagent
-RUN chmod +x /cagent
-RUN cat <<EOF > /agent.yaml
-{{ .AgentConfig }}
-EOF
-RUN chmod +r /agent.yaml && mkdir /data && chmod 777 -R /data
-USER cagent
-ENTRYPOINT ["/cagent"]
-CMD ["api", "--session-db", "/data/session.db", "/agent.yaml"]
 
+FROM docker/cagent
 LABEL com.docker.agent.packaging.version="v0.0.1"
 LABEL com.docker.agent.runtime="cagent"
 LABEL org.opencontainers.image.description="{{ .Description }}"
 LABEL org.opencontainers.image.licenses="{{ .Licenses }}"
 LABEL com.docker.agent.mcp-servers="{{ .McpServers }}"
 LABEL com.docker.agent.models="{{ .Models }}"
+VOLUME /data
+CMD ["api", "--session-db", "/data/session.db", "/agent.yaml"]
+RUN cat <<EOF >/agent.yaml
+{{ .AgentConfig }}
+EOF