diff --git a/k8s/infra/forgejo-runner-images/Dockerfile.golang b/k8s/infra/forgejo-runner-images/Dockerfile.golang
index 44a8908..93d7f34 100644
--- a/k8s/infra/forgejo-runner-images/Dockerfile.golang
+++ b/k8s/infra/forgejo-runner-images/Dockerfile.golang
@@ -1,12 +1,12 @@
 FROM golang:1.26-bookworm
 
-# Add Node.js precheck script
+# Install Node.js, npm, and Docker CLI
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    nodejs npm \
+    nodejs npm docker.io \
     && rm -rf /var/lib/apt/lists/*
 
 # Verify installations
-RUN node --version && npm --version && go version
+RUN go version && node --version && npm --version && docker --version
 
 LABEL maintainer="homelab" \
-      description="Golang 1.26 + Node.js pre-installed with precheck"
+      description="Golang 1.26 + Node.js + Docker CLI pre-installed"
diff --git a/k8s/infra/forgejo-runner-images/Dockerfile.node b/k8s/infra/forgejo-runner-images/Dockerfile.node
index 025b90a..6bbc58b 100644
--- a/k8s/infra/forgejo-runner-images/Dockerfile.node
+++ b/k8s/infra/forgejo-runner-images/Dockerfile.node
@@ -1,11 +1,12 @@
 FROM node:22-bookworm
 
-# Node.js already installed, ensure npm is up to date
-RUN apt-get update && apt-get upgrade -y \
+# Node.js already installed, add Docker CLI
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    docker.io \
     && rm -rf /var/lib/apt/lists/*
 
 # Verify installations
-RUN node --version && npm --version
+RUN node --version && npm --version && docker --version
 
 LABEL maintainer="homelab" \
-      description="Node.js 22 with latest npm"
+      description="Node.js 22 + Docker CLI pre-installed"
diff --git a/k8s/infra/forgejo-runner-images/Dockerfile.rust b/k8s/infra/forgejo-runner-images/Dockerfile.rust
index a9ba6ea..bece352 100644
--- a/k8s/infra/forgejo-runner-images/Dockerfile.rust
+++ b/k8s/infra/forgejo-runner-images/Dockerfile.rust
@@ -1,12 +1,12 @@
 FROM rust:1-bookworm
 
-# Add Node.js
+# Add Node.js and Docker CLI
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    nodejs npm \
+    nodejs npm docker.io \
     && rm -rf /var/lib/apt/lists/*
 
 # Verify installations
-RUN rustc --version && cargo --version && node --version && npm --version
+RUN rustc --version && cargo --version && node --version && npm --version && docker --version
 
 LABEL maintainer="homelab" \
-      description="Rust 1 + Node.js pre-installed"
+      description="Rust 1 + Node.js + Docker CLI pre-installed"