diff --git a/gitea-runner/main.yaml b/gitea-runner/main.yaml
index b1da907..76252b6 100644
--- a/gitea-runner/main.yaml
+++ b/gitea-runner/main.yaml
@@ -16,9 +16,6 @@ data:
     log:
       level: debug
     runner:
-      envs:
-        DOCKER_HOST: tcp://localhost:2376
-        DOCKER_TLS_VERIFY: "0"
       labels:
         - ubuntu-latest:docker://docker.gitea.com/runner-images:ubuntu-latest
         - ubuntu-22.04:docker://docker.gitea.com/runner-images:ubuntu-22.04
@@ -66,12 +63,7 @@ spec:
         app.kubernetes.io/name: act-runner
     spec:
       containers:
-      - command:
-        - sh
-        - -c
-        - while ! nc -z localhost 2376 </dev/null; do echo 'waiting for docker daemon...';
-          sleep 5; done; /sbin/tini -- run.sh
-        env:
+      - env:
         - name: GITEA_INSTANCE_URL
           value: https://git.borninpain.de
         - name: GITEA_RUNNER_REGISTRATION_TOKEN
@@ -87,29 +79,16 @@ spec:
           value: /certs/client
         - name: DOCKER_TLS_VERIFY
           value: "1"
-        image: docker.io/gitea/act_runner:0.2.13
+        image: docker.io/gitea/act_runner:0.2.13-dind-rootless
         imagePullPolicy: IfNotPresent
         name: act-runner
+        securityContext:
+          privileged: true
         volumeMounts:
         - mountPath: /data
           name: data
         - mountPath: /config
           name: config
-        - mountPath: /certs
-          name: docker-certs
-      - env:
-        - name: DOCKER_TLS_CERTDIR
-          value: /certs
-        - name: DOCKER_RUN_ARGS
-          value: "-v /certs/client:/certs/client:ro"
-        image: docker:23.0.6-dind
-        imagePullPolicy: IfNotPresent
-        name: docker-dind
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - mountPath: /certs
-          name: docker-certs
       restartPolicy: Always
       securityContext:
         fsGroup: 1000
@@ -119,8 +98,6 @@ spec:
       - configMap:
           name: gitea-runner-act-runner-config
         name: config
-      - emptyDir: {}
-        name: docker-certs
   updateStrategy:
     type: RollingUpdate
   volumeClaimTemplates:
diff --git a/gitea-runner/src/values.yaml b/gitea-runner/src/values.yaml
index f6e2b1d..ec85bae 100644
--- a/gitea-runner/src/values.yaml
+++ b/gitea-runner/src/values.yaml
@@ -32,7 +32,7 @@ runner:
   # Docker in Docker configuration for running Docker commands inside the runner.
   dockerDind:
     # -- Enable Docker in Docker with root user.
-    enabled: true
+    enabled: false
     # -- Docker DinD image repository and tag.
     image: docker:23.0.6-dind