diff --git a/k8s/infra/forgejo-runner/templates/configmap.yaml b/k8s/infra/forgejo-runner/templates/configmap.yaml
index c4519cf..30334e9 100644
--- a/k8s/infra/forgejo-runner/templates/configmap.yaml
+++ b/k8s/infra/forgejo-runner/templates/configmap.yaml
@@ -32,12 +32,8 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   config.yaml: |
-    runner:
-      envs:
-        DOCKER_HOST: tcp://localhost:2376
-        DOCKER_TLS_VERIFY: "1"
-        DOCKER_CERT_PATH: /docker-certs/client
     container:
       valid_volumes:
         - /docker-certs/client
       network: host
+      docker_host: automount
diff --git a/k8s/infra/forgejo-runner/templates/deployment.yaml b/k8s/infra/forgejo-runner/templates/deployment.yaml
index 6b11c26..5412b78 100644
--- a/k8s/infra/forgejo-runner/templates/deployment.yaml
+++ b/k8s/infra/forgejo-runner/templates/deployment.yaml
@@ -70,6 +70,8 @@ spec:
               mountPath: /data
             - name: docker-certs
               mountPath: /docker-certs
+            - name: docker-sock
+              mountPath: /var/run
             - name: homelab-ca
               mountPath: /etc/ssl/certs/homelab-ca.pem
               subPath: ca.crt
@@ -89,6 +91,8 @@ spec:
           volumeMounts:
             - name: docker-certs
               mountPath: /docker-certs
+            - name: docker-sock
+              mountPath: /var/run
             - name: dind-storage
               mountPath: /var/lib/docker
             - name: homelab-ca
@@ -113,6 +117,8 @@ spec:
             claimName: {{ .Release.Name }}-dind
         - name: docker-certs
           emptyDir: {}    # DinD regenerates mTLS certs on each start
+        - name: docker-sock
+          emptyDir: {}    # Shared docker socket between dind and runner
         - name: homelab-ca
           # homelab-ca is a ConfigMap (public CA trust bundle), not a Secret.
           # The volumeMounts use subPath: ca.crt to project the single cert file.