diff --git a/Justfile b/Justfile
index 6770c7f..e26cd24 100755
--- a/Justfile
+++ b/Justfile
@@ -6,9 +6,14 @@ _device action dir +moreargs="":
 	set -ex
 	sudo $(set -x; nix-build --no-link --show-trace $(dirname {{dir}})/default.nix -A {{action}} --argstr dir {{dir}} {{moreargs}})
 
-_rebuild-device dir rebuildarg="dry-activate" +moreargs="":
+_render_templates:
 	#!/usr/bin/env bash
+	set -ex
 	nix/scripts/pre-eval-fixed.sh nix/home-manager/profiles/dotfiles/vcsh{.tmpl,}.nix
+
+_rebuild-device dir rebuildarg="dry-activate" +moreargs="": _render_templates
+	#!/usr/bin/env bash
+	set -ex
 	just -v _device rebuild {{dir}} --argstr rebuildarg {{rebuildarg}} {{moreargs}}
 
 # Rebulid this device's NixOS
@@ -86,5 +91,5 @@ disk-umount dir:
 	just -v _device diskUmount {{dir}} --argstr rebuildarg "dummy"
 
 # Perform an offline installation on the mounted target disk, specified by device configuration directory
-disk-install dir:
+disk-install dir: _render_templates
 	just -v _device diskInstall {{dir}} --argstr rebuildarg "dummy"