diff --git a/runner/entrypoint-dind-rootless.sh b/runner/entrypoint-dind-rootless.sh
index 9c8cc01150..3cb4f5300f 100644
--- a/runner/entrypoint-dind-rootless.sh
+++ b/runner/entrypoint-dind-rootless.sh
@@ -6,6 +6,7 @@ trap graceful_stop TERM
 log.notice "Writing out Docker config file"
 /bin/bash <<SCRIPT
 
+mkdir -p  /home/runner/.config/docker/ /home/runner/.config/buildkit
 if [ ! -f /home/runner/.config/docker/daemon.json ]; then
   echo "{}" > /home/runner/.config/docker/daemon.json
 fi
@@ -22,6 +23,10 @@ fi
 
 if [ -n "${DOCKER_REGISTRY_MIRROR}" ]; then
 jq ".\"registry-mirrors\"[0] = \"${DOCKER_REGISTRY_MIRROR}\"" /home/runner/.config/docker/daemon.json > /tmp/.daemon.json && mv /tmp/.daemon.json /home/runner/.config/docker/daemon.json
+cat > /home/runner/.config/buildkit/buildkitd.toml <<- EOM
+[registry."docker.io"]
+  mirrors = ["`echo "${DOCKER_REGISTRY_MIRROR}" | sed -e 's|^.*://||;s|/$||'`"]
+EOM
 fi
 SCRIPT
 
diff --git a/runner/entrypoint-dind.sh b/runner/entrypoint-dind.sh
index 56bd6e854d..b4758e8e9d 100755
--- a/runner/entrypoint-dind.sh
+++ b/runner/entrypoint-dind.sh
@@ -4,7 +4,7 @@ source graceful-stop.sh
 trap graceful_stop TERM
 
 sudo /bin/bash <<SCRIPT
-mkdir -p /etc/docker
+mkdir -p /etc/docker /etc/buildkit
 
 if [ ! -f /etc/docker/daemon.json ]; then
   echo "{}" > /etc/docker/daemon.json
@@ -22,10 +22,20 @@ fi
 
 if [ -n "${DOCKER_REGISTRY_MIRROR}" ]; then
 jq ".\"registry-mirrors\"[0] = \"${DOCKER_REGISTRY_MIRROR}\"" /etc/docker/daemon.json > /tmp/.daemon.json && mv /tmp/.daemon.json /etc/docker/daemon.json
+cat > /etc/buildkit/buildkitd.toml <<- EOM
+[registry."docker.io"]
+  mirrors = ["`echo "${DOCKER_REGISTRY_MIRROR}" | sed -e 's|^.*://||;s|/$||'`"]
+EOM
 fi
 
 if [ -n "${DOCKER_INSECURE_REGISTRY}" ]; then
 jq ".\"insecure-registries\"[0] = \"${DOCKER_INSECURE_REGISTRY}\"" /etc/docker/daemon.json > /tmp/.daemon.json && mv /tmp/.daemon.json /etc/docker/daemon.json
+cat > /etc/buildkit/buildkitd.toml <<- EOM
+[registry."docker.io"]
+  mirrors = ["`echo "${DOCKER_REGISTRY_MIRROR}" | sed -e 's|^.*://||;s|/$||'`"]
+  http = true
+  insecure = true
+EOM
 fi
 SCRIPT