diff --git a/act-runner/Dockerfile.task-executor b/act-runner/Dockerfile.task-executor
index e03b0a0..889adc3 100644
--- a/act-runner/Dockerfile.task-executor
+++ b/act-runner/Dockerfile.task-executor
@@ -4,7 +4,7 @@ FROM ubuntu:22.04
 RUN ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone
 
 # Install basic tools
-RUN apt update && apt install -y gpg curl apt-transport-https ca-certificates lsb-release build-essential
+RUN apt update && apt install -y gpg curl wget apt-transport-https ca-certificates lsb-release build-essential
 
 # Add Docker repo
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
@@ -16,7 +16,6 @@ ARG NODE_MAJOR=18
 # See: https://stackoverflow.com/a/77021599/1701505
 RUN set -uex; \
     apt-get update; \
-    apt-get install -y ca-certificates curl gnupg; \
     mkdir -p /etc/apt/keyrings; \
     curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
      | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \
@@ -31,3 +30,24 @@ RUN apt update && apt install -y docker-ce && rm -rf /var/lib/apt/lists/*
 RUN apt update && apt install -y sudo
 # Install software-properties-common so we have the add-apt-repository command, used by some actions to add a package repo
 RUN apt update && apt install -y software-properties-common
+
+# Packages and files to support dind functionality see: https://github.com/cruizba/ubuntu-dind
+RUN apt update && apt install -y iptables supervisor
+
+COPY modprobe start-docker.sh entrypoint.sh /usr/local/bin/
+COPY supervisor/ /etc/supervisor/conf.d/
+COPY logger.sh /opt/bash-utils/logger.sh
+
+RUN chmod +x /usr/local/bin/start-docker.sh \
+	/usr/local/bin/entrypoint.sh \
+	/usr/local/bin/modprobe
+
+ENV DOCKER_HOST "unix:///var/run/dind.sock"
+
+# This VOLUME directive is required for k3d to work, probably because it needs the directory to exist
+# the volume does not need to be mounted.
+VOLUME /var/lib/docker
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+CMD ["bash"]
+
diff --git a/act-runner/entrypoint.sh b/act-runner/entrypoint.sh
new file mode 100755
index 0000000..afc1037
--- /dev/null
+++ b/act-runner/entrypoint.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Start docker
+start-docker.sh
+
+# Execute specified command
+"$@"
diff --git a/act-runner/logger.sh b/act-runner/logger.sh
new file mode 100755
index 0000000..4a103ff
--- /dev/null
+++ b/act-runner/logger.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Logger from this post http://www.cubicrace.com/2016/03/log-tracing-mechnism-for-shell-scripts.html
+
+function INFO(){
+    local function_name="${FUNCNAME[1]}"
+    local msg="$1"
+    timeAndDate=`date`
+    echo "[$timeAndDate] [INFO] [${0}] $msg"
+}
+
+
+function DEBUG(){
+    local function_name="${FUNCNAME[1]}"
+    local msg="$1"
+    timeAndDate=`date`
+    echo "[$timeAndDate] [DEBUG] [${0}] $msg"
+}
+
+function ERROR(){
+    local function_name="${FUNCNAME[1]}"
+    local msg="$1"
+    timeAndDate=`date`
+    echo "[$timeAndDate] [ERROR]  $msg"
+}
\ No newline at end of file
diff --git a/act-runner/modprobe b/act-runner/modprobe
new file mode 100755
index 0000000..45033ff
--- /dev/null
+++ b/act-runner/modprobe
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -eu
+
+# "modprobe" without modprobe
+# https://twitter.com/lucabruno/status/902934379835662336
+
+# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe
+
+# Docker often uses "modprobe -va foo bar baz"
+# so we ignore modules that start with "-"
+for module; do
+	if [ "${module#-}" = "$module" ]; then
+		ip link show "$module" || true
+		lsmod | grep "$module" || true
+	fi
+done
+
+# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort
+export PATH='/usr/sbin:/usr/bin:/sbin:/bin'
+exec modprobe "$@"
\ No newline at end of file
diff --git a/act-runner/stack/deploy/commands.py b/act-runner/stack/deploy/commands.py
index d5e861b..21fa62b 100644
--- a/act-runner/stack/deploy/commands.py
+++ b/act-runner/stack/deploy/commands.py
@@ -21,6 +21,7 @@ def create(context, extra_args):
     # Our goal here is just to copy the config file for act
     deployment_config_dir = context.deployment_dir.joinpath("data",
                                                             "act-runner-config")
-    compose_file = [f for f in context.command_context.cluster_context.compose_files if "act-runner" in f][0]
+    command_context = extra_args[2]
+    compose_file = [f for f in command_context.cluster_context.compose_files if "act-runner" in f][0]
     source_config_file = Path(compose_file).parent.joinpath("config", "act-runner-config.yml")
     copy(source_config_file, deployment_config_dir)
diff --git a/act-runner/start-docker.sh b/act-runner/start-docker.sh
new file mode 100755
index 0000000..c713751
--- /dev/null
+++ b/act-runner/start-docker.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+source /opt/bash-utils/logger.sh
+
+function wait_for_process () {
+    local max_time_wait=30
+    local process_name="$1"
+    local waited_sec=0
+    while ! pgrep "$process_name" >/dev/null && ((waited_sec < max_time_wait)); do
+        INFO "Process $process_name is not running yet. Retrying in 1 seconds"
+        INFO "Waited $waited_sec seconds of $max_time_wait seconds"
+        sleep 1
+        ((waited_sec=waited_sec+1))
+        if ((waited_sec >= max_time_wait)); then
+            return 1
+        fi
+    done
+    return 0
+}
+
+INFO "Starting supervisor"
+/usr/bin/supervisord -n >> /dev/null 2>&1 &
+
+INFO "Waiting for docker to be running"
+wait_for_process dockerd
+if [ $? -ne 0 ]; then
+    ERROR "dockerd is not running after max time"
+    exit 1
+else
+    INFO "dockerd is running"
+fi
\ No newline at end of file
diff --git a/act-runner/supervisor/dockerd.conf b/act-runner/supervisor/dockerd.conf
new file mode 100644
index 0000000..4481b74
--- /dev/null
+++ b/act-runner/supervisor/dockerd.conf
@@ -0,0 +1,6 @@
+[program:dockerd]
+command=/usr/bin/dockerd -H %(ENV_DOCKER_HOST)s --userland-proxy=false
+autostart=true
+autorestart=true
+stderr_logfile=/var/log/dockerd.err.log
+stdout_logfile=/var/log/dockerd.out.log