diff --git a/.github/workflows/binary-cache.yaml b/.github/workflows/binary-cache.yaml
index 7abbf58..b8002ca 100644
--- a/.github/workflows/binary-cache.yaml
+++ b/.github/workflows/binary-cache.yaml
@@ -22,4 +22,4 @@ jobs:
     - name: Build dev shell
       run: |
         export NIXPKGS_ALLOW_UNFREE=1
-        nix develop --impure --accept-flake-config --build
+        nix develop --impure --accept-flake-config --accept-flake-config --build
diff --git a/.github/workflows/template-darwin-system.yaml b/.github/workflows/template-darwin-system.yaml
index bd1fb83..6db5d57 100644
--- a/.github/workflows/template-darwin-system.yaml
+++ b/.github/workflows/template-darwin-system.yaml
@@ -6,7 +6,7 @@ on:
       - templates/darwin-system/*
 
 jobs:
-  binary-cache:
+  template-test:
     permissions:
       contents: write
     runs-on: macos-latest
@@ -20,5 +20,5 @@ jobs:
     - name: Build packages
       run: |
         export NIXPKGS_ALLOW_UNFREE=1
-        nix flake new -t .#darwin-system darwin-system
-        nix run --flake ./darwin-system#activate
+        nix flake new --accept-flake-config -t .#darwin-system darwin-system
+        sudo nix run --accept-flake-config path:"$(pwd)/darwin-system"#activate
diff --git a/templates/darwin-system/configuration.nix b/templates/darwin-system/configuration.nix
index eb24a9e..e5319f2 100644
--- a/templates/darwin-system/configuration.nix
+++ b/templates/darwin-system/configuration.nix
@@ -12,7 +12,7 @@ in
     modules = [
       (dotfiles.lib.configureOsModules {
         osModules = attrValues dotfiles.modules.darwin;
-        homeModules = attrValues dotfiles.modules.homeModules;
+        homeModules = dotfiles.lib.homeModulesWithDisabled [ "default-apps" ];
       })
       (
         let
diff --git a/templates/darwin-system/flake.nix b/templates/darwin-system/flake.nix
index b758d1e..3bcb812 100644
--- a/templates/darwin-system/flake.nix
+++ b/templates/darwin-system/flake.nix
@@ -51,4 +51,11 @@
             };
         };
     };
+
+  nixConfig = {
+    extra-substituters = [ "https://luke-channings.cachix.org" ];
+    extra-trusted-public-keys = [
+      "luke-channings.cachix.org-1:ETsZ3R5ue9QOwO4spg8aGJMwMU6k5tQIaHWnTakGHjo="
+    ];
+  };
 }
diff --git a/templates/devenv/flake.nix b/templates/devenv/flake.nix
index dfe1f00..a1093fc 100644
--- a/templates/devenv/flake.nix
+++ b/templates/devenv/flake.nix
@@ -39,4 +39,11 @@
         "aarch64-linux"
       ];
     };
+
+  nixConfig = {
+    extra-substituters = [ "https://luke-channings.cachix.org" ];
+    extra-trusted-public-keys = [
+      "luke-channings.cachix.org-1:ETsZ3R5ue9QOwO4spg8aGJMwMU6k5tQIaHWnTakGHjo="
+    ];
+  };
 }