diff --git a/app/data/container-build/cerc-act-runner-task-executor/build.sh b/app/data/container-build/cerc-act-runner-task-executor/build.sh
new file mode 100755
index 00000000..843e86af
--- /dev/null
+++ b/app/data/container-build/cerc-act-runner-task-executor/build.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Build a local version of the task executor for act-runner
+docker build -t cerc/act-runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/act_runner/Dockerfile.task-executor ${CERC_REPO_BASE_DIR}/act_runner
diff --git a/app/data/container-build/cerc-act-runner/build.sh b/app/data/container-build/cerc-act-runner/build.sh
new file mode 100755
index 00000000..2fdb3f2e
--- /dev/null
+++ b/app/data/container-build/cerc-act-runner/build.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Build a local version of the act-runner image
+docker build -t cerc/act-runner:local -f ${CERC_REPO_BASE_DIR}/act_runner/Dockerfile ${CERC_REPO_BASE_DIR}/act_runner
diff --git a/app/data/container-build/cerc-builder-js/Dockerfile b/app/data/container-build/cerc-builder-js/Dockerfile
index 35c9a972..71c770c0 100644
--- a/app/data/container-build/cerc-builder-js/Dockerfile
+++ b/app/data/container-build/cerc-builder-js/Dockerfile
@@ -1,7 +1,7 @@
 # Originally from: https://github.com/devcontainers/images/blob/main/src/javascript-node/.devcontainer/Dockerfile
 # Which depends on: https://github.com/nodejs/docker-node/blob/main/Dockerfile-debian.template
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
+ARG VARIANT=18-bullseye
 FROM node:${VARIANT}
 
 # Set these args to change the uid/gid for the base container's "node" user to match that of the host user (so bind mounts work as expected).
diff --git a/app/data/container-build/cerc-laconic-registry-cli/Dockerfile b/app/data/container-build/cerc-laconic-registry-cli/Dockerfile
index e0b1ae1e..213ef8f4 100644
--- a/app/data/container-build/cerc-laconic-registry-cli/Dockerfile
+++ b/app/data/container-build/cerc-laconic-registry-cli/Dockerfile
@@ -1,6 +1,6 @@
 # Originally from: https://github.com/devcontainers/images/blob/main/src/javascript-node/.devcontainer/Dockerfile
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
+ARG VARIANT=18-bullseye
 FROM node:${VARIANT}
 
 ARG USERNAME=node
diff --git a/app/data/container-image-list.txt b/app/data/container-image-list.txt
index 9b9deae0..c7b76e8d 100644
--- a/app/data/container-image-list.txt
+++ b/app/data/container-image-list.txt
@@ -29,3 +29,5 @@ cerc/builder-js
 cerc/keycloak
 cerc/tx-spammer
 cerc/builder-gerbil
+cerc/act-runner
+cerc/act-runner-task-executor
diff --git a/app/data/repository-list.txt b/app/data/repository-list.txt
index 0f2f9768..5acc4523 100644
--- a/app/data/repository-list.txt
+++ b/app/data/repository-list.txt
@@ -25,3 +25,4 @@ lirewine/gem
 lirewine/debug
 lirewine/crypto
 lirewine/sdk
+telackey/act_runner
diff --git a/app/data/stacks/package-registry/stack.yml b/app/data/stacks/package-registry/stack.yml
index 771149ed..596f6e72 100644
--- a/app/data/stacks/package-registry/stack.yml
+++ b/app/data/stacks/package-registry/stack.yml
@@ -3,6 +3,10 @@ name: package-registry
 decription: "Local Package Registry"
 repos:
   - cerc-io/hosting
+  - telackey/act_runner
+containers:
+  - cerc/act-runner
+  - cerc/act-runner-task-executor
 pods:
   - name: gitea
     repository: cerc-io/hosting