diff --git a/.forgejo/workflows/cache.yaml b/.forgejo/workflows/cache.yaml
index 93a9c3b..f0f2526 100644
--- a/.forgejo/workflows/cache.yaml
+++ b/.forgejo/workflows/cache.yaml
@@ -3,7 +3,7 @@ jobs:
   push:
     runs-on: docker
     container:
-      image: git.kun.is/home/forgejo-nix-action:687d16c49ea7936068bac64ec68c480a9d681962
+      image: git.kun.is/home/forgejo-nix-action:9b44b726c0b6eadc2e3006ec1fa1338a1a2e79f0
     steps:
       - name: Clone repository
         run: git clone https://git.kun.is/home/container-images.git checkout
@@ -12,19 +12,18 @@ jobs:
           /bin/attic login local https://attic.kun.is ${{ secrets.ATTIC_TOKEN }}
           /bin/attic use home
       - name: Log into container registry
-        # run: echo -n "${{ secrets.RUNNER_TOKEN }}" | /bin/docker login https://git.kun.is --username pim --password-stdin
-        run: /bin/skopeo login --username pim --password ${{ secrets.RUNNER_TOKEN }} https://git.kun.is
+        run: echo -n "${{ secrets.RUNNER_TOKEN }}" | /bin/docker login https://git.kun.is --username pim --password-stdin
       - name: Build Pim's blog
-        run: nix build --out-link blog-pim ./checkout#packages.x86_64-linux.blog-pim
+        run: nix build --extra-experimental-features nix-command --extra-experimental-features flakes --out-link blog-pim ./checkout#packages.x86_64-linux.blog-pim
       - name: Push Pim's blog to Nix cache
         run: /bin/attic push home blog-pim
       - name: Push Pim's blog to container registry
-        run: nix run ./checkout#packages.x86_64-linux.release ./checkout#packages.x86_64-linux.blog-pim blog-pim ./checkout
+        run: nix --extra-experimental-features "nix-command flakes" run ./checkout#packages.x86_64-linux.release ./checkout#packages.x86_64-linux.blog-pim blog-pim ./checkout
       - name: Build forgejo-nix-action
-        run: nix build --no-allow-dirty --out-link forgejo-nix-action ./checkout#packages.x86_64-linux.forgejo-nix-action
+        run: nix build --extra-experimental-features nix-command --extra-experimental-features flakes --no-allow-dirty --out-link forgejo-nix-action ./checkout#packages.x86_64-linux.forgejo-nix-action
       - name: Push forgjeo-nix-action to Nix cache
         run: /bin/attic push home forgejo-nix-action
       - name: Build Atticd
-        run: nix build --no-allow-dirty --out-link atticd ./checkout#packages.x86_64-linux.atticd
+        run: nix build --extra-experimental-features nix-command --extra-experimental-features flakes --no-allow-dirty --out-link atticd ./checkout#packages.x86_64-linux.atticd
       - name: Push atticd to Nix cache
         run: /bin/attic push home atticd
diff --git a/forgejo-nix-action.nix b/forgejo-nix-action.nix
index dbbd00e..0c09cdc 100644
--- a/forgejo-nix-action.nix
+++ b/forgejo-nix-action.nix
@@ -20,9 +20,7 @@ let
   nixConfDrv = pkgs.stdenv.mkDerivation {
     name = "nix.conf";
     dontUnpack = true;
-    installPhase = ''
-      install -Dm755 ${nixConf} $out/etc/nix/nix.conf
-    '';
+    installPhase = "install -Dm755 ${nixConf} $out/etc/nix/nix.conf";
   };
 in
 {
@@ -33,9 +31,14 @@ in
 
     copyToRoot = pkgs.buildEnv {
       name = "image-root";
-      # TODO: Maybe we don't even want these binaries in the base image, but run everything through nix-run?
-      paths = with pkgs; [ coreutils attic-client skopeo nixConfDrv ];
-      pathsToLink = [ "/bin" "/etc" ];
+      paths = with pkgs; [ coreutils attic-client docker-client nixConfDrv ];
+      pathsToLink = [ "/bin" "/etc/nix" ];
     };
+
+    # config = {
+    #   Env = [
+    #     "PATH=/bin:/root/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin"
+    #   ];
+    # };
   };
 })