diff --git a/.github/workflows/arc-update-runners-scheduled.yaml b/.github/workflows/arc-update-runners-scheduled.yaml
index 5c540531..c73f6499 100644
--- a/.github/workflows/arc-update-runners-scheduled.yaml
+++ b/.github/workflows/arc-update-runners-scheduled.yaml
@@ -132,6 +132,7 @@ jobs:
           sed -i "s/$CURRENT_VERSION/$LATEST_VERSION/g" runner/Makefile
           sed -i "s/$CURRENT_VERSION/$LATEST_VERSION/g" Makefile
           sed -i "s/$CURRENT_VERSION/$LATEST_VERSION/g" test/e2e/e2e_test.go
+          sed -i "s/$CURRENT_VERSION/$LATEST_VERSION/g" docker-bake.hcl
 
           CURRENT_VERSION="${CONTAINER_HOOKS_CURRENT_VERSION//./\\.}"
           LATEST_VERSION="${CONTAINER_HOOKS_LATEST_VERSION//./\\.}"
@@ -139,6 +140,7 @@ jobs:
           sed -i "s/$CURRENT_VERSION/$LATEST_VERSION/g" runner/Makefile
           sed -i "s/$CURRENT_VERSION/$LATEST_VERSION/g" Makefile
           sed -i "s/$CURRENT_VERSION/$LATEST_VERSION/g" test/e2e/e2e_test.go
+          sed -i "s/$CURRENT_VERSION/$LATEST_VERSION/g" docker-bake.hcl
 
       - name: Commit changes
         run: |
diff --git a/docker-bake.hcl b/docker-bake.hcl
new file mode 100644
index 00000000..77c668c0
--- /dev/null
+++ b/docker-bake.hcl
@@ -0,0 +1,28 @@
+group default {
+  targets = ["actions-runner-dind-ubuntu-22-04"]
+}
+
+variable TAG_SUFFIX { default = "latest" }
+variable RUNNER_VERSION { default = "2.320.0" }
+variable RUNNER_CONTAINER_HOOKS_VERSION { default = "0.6.2" }
+variable DOCKER_VERSION { default = "24.0.7" }
+
+target actions-runner-dind-ubuntu-22-04 {
+  context     = "runner/"
+  contexts = {
+    "ubuntu:18.04" = "docker-image://registry.smtx.io/sdn-base/ubuntu:18.04"
+    "ubuntu:20.04" = "docker-image://registry.smtx.io/sdn-base/ubuntu:20.04"
+    "ubuntu:22.04" = "docker-image://registry.smtx.io/sdn-base/ubuntu:22.04"
+    "ubuntu:24.04" = "docker-image://registry.smtx.io/sdn-base/ubuntu:24.04"
+  }
+  dockerfile = "actions-runner-dind.ubuntu-22.04.dockerfile"
+  args = {
+    TARGETPLATFORM                 = "linux/amd64"
+    RUNNER_VERSION                 = RUNNER_VERSION
+    RUNNER_CONTAINER_HOOKS_VERSION = RUNNER_CONTAINER_HOOKS_VERSION
+    DOCKER_VERSION                 = DOCKER_VERSION
+  }
+  tags      = ["registry.smtx.io/everoute/summerwind/actions-runner-dind:ubuntu-22.04-buildx-${TAG_SUFFIX}"]
+  platforms = ["linux/amd64"]
+  output    = ["type=registry"]
+}