diff --git a/kubernetes/config/kustomization.yaml b/kubernetes/config/kustomization.yaml
index 9adda085..b789eff0 100644
--- a/kubernetes/config/kustomization.yaml
+++ b/kubernetes/config/kustomization.yaml
@@ -8,7 +8,7 @@ configMapGenerator:
     - browser.jsonnet
     - common.libsonnet
     - frontend.jsonnet
-    - runner-ubuntu22-04.jsonnet
+    - runner-ubuntu24-04.jsonnet
     - scheduler.jsonnet
     - storage.jsonnet
-    - worker-ubuntu22-04.jsonnet
+    - worker-ubuntu24-04.jsonnet
diff --git a/kubernetes/config/runner-ubuntu22-04.jsonnet b/kubernetes/config/runner-ubuntu24-04.jsonnet
similarity index 83%
rename from kubernetes/config/runner-ubuntu22-04.jsonnet
rename to kubernetes/config/runner-ubuntu24-04.jsonnet
index 7e0103fa..1fa59f98 100644
--- a/kubernetes/config/runner-ubuntu22-04.jsonnet
+++ b/kubernetes/config/runner-ubuntu24-04.jsonnet
@@ -4,7 +4,7 @@ local common = import 'common.libsonnet';
   buildDirectoryPath: '/worker/build',
   // TODO: global: common.global,
   grpcServers: [{
-    listenPaths: ['/worker/runner'],
+    listenAddresses: [':50051'],
     authenticationPolicy: { allow: {} },
   }],
 }
diff --git a/kubernetes/config/worker-ubuntu22-04.jsonnet b/kubernetes/config/worker-ubuntu24-04.jsonnet
similarity index 87%
rename from kubernetes/config/worker-ubuntu22-04.jsonnet
rename to kubernetes/config/worker-ubuntu24-04.jsonnet
index 6607d4f5..22dbd105 100644
--- a/kubernetes/config/worker-ubuntu22-04.jsonnet
+++ b/kubernetes/config/worker-ubuntu24-04.jsonnet
@@ -17,12 +17,12 @@ local common = import 'common.libsonnet';
       cacheReplacementPolicy: 'LEAST_RECENTLY_USED',
     },
     runners: [{
-      endpoint: { address: 'unix:///worker/runner' },
+      endpoint: { address: '127.0.0.1:50051' },
       concurrency: 8,
       platform: {
         properties: [
           { name: 'OSFamily', value: 'linux' },
-          { name: 'container-image', value: 'docker://ghcr.io/catthehacker/ubuntu:act-22.04@sha256:dd7654ffb01d5b7b54b23b9ce928a1f7f2d08c7b3d7e320b6574b55d7ccde78b' },
+          { name: 'container-image', value: 'docker://ghcr.io/catthehacker/ubuntu:act-24.04@sha256:eb153df03ca81e75f73d40a2b14b5dbd2605e7813556efab47b23dfbfceeaa9d' },
         ],
       },
       workerId: {
diff --git a/kubernetes/kustomization.yaml b/kubernetes/kustomization.yaml
index 52a6f391..3624abff 100644
--- a/kubernetes/kustomization.yaml
+++ b/kubernetes/kustomization.yaml
@@ -8,4 +8,4 @@ resources:
   - frontend.yaml
   - scheduler.yaml
   - storage.yaml
-  - worker-ubuntu22-04.yaml
+  - worker-ubuntu24-04.yaml
diff --git a/kubernetes/scheduler.yaml b/kubernetes/scheduler.yaml
index 8b1bc211..d910f0b4 100644
--- a/kubernetes/scheduler.yaml
+++ b/kubernetes/scheduler.yaml
@@ -1,19 +1,19 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: scheduler-ubuntu22-04
+  name: scheduler-ubuntu24-04
   namespace: buildbarn
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: scheduler
-      instance: ubuntu22-04
+      instance: ubuntu24-04
   template:
     metadata:
       labels:
         app: scheduler
-        instance: ubuntu22-04
+        instance: ubuntu24-04
     spec:
       containers:
       - args:
@@ -62,7 +62,7 @@ spec:
     name: http
   selector:
     app: scheduler
-    instance: ubuntu22-04
+    instance: ubuntu24-04
   type: ClusterIP
 ---
 apiVersion: networking.k8s.io/v1
diff --git a/kubernetes/worker-ubuntu22-04.yaml b/kubernetes/worker-ubuntu24-04.yaml
similarity index 70%
rename from kubernetes/worker-ubuntu22-04.yaml
rename to kubernetes/worker-ubuntu24-04.yaml
index adce354c..92556226 100644
--- a/kubernetes/worker-ubuntu22-04.yaml
+++ b/kubernetes/worker-ubuntu24-04.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: worker-ubuntu22-04
+  name: worker-ubuntu24-04
   namespace: buildbarn
   annotations:
     prometheus.io/port: "80"
@@ -11,16 +11,16 @@ spec:
   selector:
     matchLabels:
       app: worker
-      instance: ubuntu22-04
+      instance: ubuntu24-04
   template:
     metadata:
       labels:
         app: worker
-        instance: ubuntu22-04
+        instance: ubuntu24-04
     spec:
       containers:
       - args:
-        - /config/worker-ubuntu22-04.jsonnet
+        - /config/worker-ubuntu24-04.jsonnet
         image: ghcr.io/buildbarn/bb-worker:20260326T163248Z-e6ab874
         name: worker
         volumeMounts:
@@ -38,9 +38,17 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
-      - command: [/bb/bb_runner, /config/runner-ubuntu22-04.jsonnet]
-        image: ghcr.io/catthehacker/ubuntu:act-22.04@sha256:dd7654ffb01d5b7b54b23b9ce928a1f7f2d08c7b3d7e320b6574b55d7ccde78b
+      - command: [/bb/bb_runner, /config/runner-ubuntu24-04.jsonnet]
+        image: ghcr.io/catthehacker/ubuntu:act-24.04@sha256:eb153df03ca81e75f73d40a2b14b5dbd2605e7813556efab47b23dfbfceeaa9d
         name: runner
+        ports:
+        - containerPort: 50051
+          name: grpc
+        readinessProbe:
+          tcpSocket:
+            port: 50051
+          initialDelaySeconds: 5
+          periodSeconds: 5
         securityContext:
           runAsUser: 65534
           allowPrivilegeEscalation: false
@@ -64,7 +72,7 @@ spec:
         command:
         - sh
         - -c
-        - mkdir -pm 0777 /worker/build && mkdir -pm 0700 /worker/cache && chmod 0777 /worker
+        - mkdir -pm 0777 /worker/build && mkdir -pm 0777 /worker/cache && chmod 0777 /worker
         volumeMounts:
         - mountPath: /worker
           name: worker
@@ -77,9 +85,9 @@ spec:
           items:
           - key: common.libsonnet
             path: common.libsonnet
-          - key: runner-ubuntu22-04.jsonnet
-            path: runner-ubuntu22-04.jsonnet
-          - key: worker-ubuntu22-04.jsonnet
-            path: worker-ubuntu22-04.jsonnet
+          - key: runner-ubuntu24-04.jsonnet
+            path: runner-ubuntu24-04.jsonnet
+          - key: worker-ubuntu24-04.jsonnet
+            path: worker-ubuntu24-04.jsonnet
       - emptyDir: {}
         name: worker