diff --git a/roles/forgejo-runner.nix b/roles/forgejo-runner.nix
index f2f2ffc..d6809fa 100644
--- a/roles/forgejo-runner.nix
+++ b/roles/forgejo-runner.nix
@@ -9,6 +9,7 @@
       pkgs,
       lib,
       config,
+      host,
       ...
     }:
     {
@@ -23,7 +24,9 @@
           cfg = config.forgejo-runner;
         in
         {
-          networking.firewall.allowedTCPPorts = [ 39175 ];
+          networking.firewall.allowedTCPPorts = [
+            39175 # Cache port
+          ];
 
           sops.secrets = {
             "forgejo_runner/token" = {
@@ -31,11 +34,11 @@
             };
           };
 
-          # environment.persistence."/persistent" = {
-          #   directories = [
-          #     "/var/lib/private/gitea-runner/runner"
-          #   ];
-          # };
+          environment.persistence."/persistent" = {
+            directories = [
+              "/var/lib/private/gitea-runner"
+            ];
+          };
 
           sops.templates."forgejo_runner_token.env" = {
             owner = "root";
@@ -44,6 +47,10 @@
             '';
           };
 
+          systemd.services.forgejo-secrets = {
+            after = [ "cephfs.mount" ];
+          };
+
           services.gitea-actions-runner = {
             package = pkgs.forgejo-actions-runner;
             instances.default = {
@@ -57,6 +64,17 @@
                 "ubuntu-20.04:docker://node:16-bullseye"
                 "ubuntu-18.04:docker://node:16-buster"
               ];
+              settings = {
+                cache = {
+                  enabled = true;
+                  host = host.ip;
+                  port = 39175;
+                };
+
+                container = {
+                  docker_host = "automount";
+                };
+              };
             };
           };
         };