diff --git a/uconsole/configs/local.nix b/uconsole/configs/local.nix
index c87215c..184e616 100644
--- a/uconsole/configs/local.nix
+++ b/uconsole/configs/local.nix
@@ -8,11 +8,14 @@
       speedFactor = 30;
       supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
       protocol = "ssh-ng";
-      publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUtNNHFWdEljcTJkazhNRWRzTG85L0lDaTI2YUloalowMGgvN3ZLcml2UWogcm9vdEBuaXhvcwo=";
     }
   ];
-  nix.settings.substituters = ["http://nixcache.trustno1.corp/"];
-  nix.settings.experimental-features = ["nix-command" "flakes"];
+  nix.settings = {
+    substituters = ["https://cache-nix.project2.xyz/uconsole" "https://nixcache.trustno1.corp/"];
+    trusted-substituters = ["https://cache-nix.project2.xyz/uconsole"];
+    trusted-public-keys = ["uconsole:t2pv3NWEtXCYY0fgv9BB8r9tRdK+Tz7HYhGq9bXIIck="];
+    experimental-features = ["nix-command" "flakes"];
+  };
 
   services.openssh.enable = true;
   users.users.oom = {
diff --git a/uconsole/sd-image-uConsole.nix b/uconsole/sd-image-uConsole.nix
index e4c695a..da3532c 100644
--- a/uconsole/sd-image-uConsole.nix
+++ b/uconsole/sd-image-uConsole.nix
@@ -20,6 +20,12 @@
     })
   ];
 
+  nix.settings = {
+    substituters = ["https://cache-nix.project2.xyz/uconsole"];
+    trusted-substituters = ["https://cache-nix.project2.xyz/uconsole"];
+    trusted-public-keys = ["uconsole:t2pv3NWEtXCYY0fgv9BB8r9tRdK+Tz7HYhGq9bXIIck="];
+  };
+
   boot.loader.grub.enable = false;
   boot.loader.generic-extlinux-compatible.enable = true;
   boot.supportedFilesystems.zfs = lib.mkForce false;
@@ -61,7 +67,6 @@
       cpi-disable-pcie.enable = true;
       cpi-disable-genet.enable = true;
       cpi-uconsole.enable = true;
-      # cpi-pmu.enable =  true;
       cpi-i2c1.enable = false;
       cpi-spi4.enable = false;
       cpi-bluetooth.enable = true;
@@ -148,7 +153,9 @@
     populateRootCommands = ''
       mkdir -p ./files/boot
       mkdir -p ./files/boot/firmware
+      mkdir -p ./files/etc/nixos
       ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
+      cp ${./configs}/* ./files/etc/nixos
     '';
   };
 }