diff --git a/home/.chezmoiscripts/_universal/run_onchange_before_05-install-homebrew.tmpl b/home/.chezmoiscripts/_universal/run_onchange_before_05-install-homebrew.tmpl
index a4dbde1e..8214c0f7 100644
--- a/home/.chezmoiscripts/_universal/run_onchange_before_05-install-homebrew.tmpl
+++ b/home/.chezmoiscripts/_universal/run_onchange_before_05-install-homebrew.tmpl
@@ -1,8 +1,8 @@
 {{- if (ne .host.distro.family "windows") -}}
 #!/usr/bin/env bash
 
-{{ includeTemplate "universal/profile-bundle" }}
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/profile-before" }}
+{{ includeTemplate "universal/logg-before" }}
 
 ### Install Xcode CLI tools on macOS
 if [ -d /Applications ] && [ -d /Library ]; then
diff --git a/home/.chezmoiscripts/_universal/run_onchange_before_08-install-zx.tmpl b/home/.chezmoiscripts/_universal/run_onchange_before_08-install-zx.tmpl
index fd5f6b96..2598b8a2 100644
--- a/home/.chezmoiscripts/_universal/run_onchange_before_08-install-zx.tmpl
+++ b/home/.chezmoiscripts/_universal/run_onchange_before_08-install-zx.tmpl
@@ -1,8 +1,8 @@
 {{- if (ne .host.distro.family "windows") -}}
 #!/usr/bin/env bash
 
-{{ includeTemplate "universal/profile-bundle" }}
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/profile-before" }}
+{{ includeTemplate "universal/logg-before" }}
 
 ### Ensure node is installed
 if ! command -v node > /dev/null; then
@@ -50,4 +50,4 @@ if ! command -v zx > /dev/null; then
 else
   logg '`zx` is already installed'
 fi
-{{ end -}}
\ No newline at end of file
+{{ end -}}
diff --git a/home/.chezmoiscripts/_universal/run_onchange_before_09-ensure-node-version.tmpl b/home/.chezmoiscripts/_universal/run_onchange_before_09-ensure-node-version.tmpl
index 34ac72c4..68dea913 100644
--- a/home/.chezmoiscripts/_universal/run_onchange_before_09-ensure-node-version.tmpl
+++ b/home/.chezmoiscripts/_universal/run_onchange_before_09-ensure-node-version.tmpl
@@ -3,8 +3,8 @@
 
 # Node.js version: {{ output "node" "--version" }}
 
-{{ includeTemplate "universal/profile-bundle" }}
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/profile-before" }}
+{{ includeTemplate "universal/logg-before" }}
 
 ### Ensure recent version of Node.js is being used
 if command -v volta > /dev/null; then
diff --git a/home/.chezmoiscripts/_universal/run_onchange_before_10-remove-bloatware.tmpl b/home/.chezmoiscripts/_universal/run_onchange_before_10-remove-bloatware.tmpl
index 2970dc0e..c67f1d55 100644
--- a/home/.chezmoiscripts/_universal/run_onchange_before_10-remove-bloatware.tmpl
+++ b/home/.chezmoiscripts/_universal/run_onchange_before_10-remove-bloatware.tmpl
@@ -1,8 +1,8 @@
 {{- if eq .host.distro.family "linux" -}}
 #!/usr/bin/env bash
 
-{{ includeTemplate "universal/profile-bundle" }}
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/profile-before" }}
+{{ includeTemplate "universal/logg-before" }}
 
 {{- $removePackages := join " " .removeLinuxPackages }}
 
diff --git a/home/.chezmoiscripts/_universal/run_onchange_before_11-install-docker.tmpl b/home/.chezmoiscripts/_universal/run_onchange_before_11-install-docker.tmpl
index a6b508e2..73c956f5 100644
--- a/home/.chezmoiscripts/_universal/run_onchange_before_11-install-docker.tmpl
+++ b/home/.chezmoiscripts/_universal/run_onchange_before_11-install-docker.tmpl
@@ -1,14 +1,14 @@
 {{- if ne .host.distro.family "windows" -}}
 #!/usr/bin/env bash
 
-{{ includeTemplate "universal/profile-bundle" }}
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/profile-before" }}
+{{ includeTemplate "universal/logg-before" }}
 
 ### Install Docker
 if [ -d /Applications ] && [ -d /System ]; then
     # macOS
     logg info 'Installing Docker on macOS via Homebrew cask'
-    brew install --cask docker 
+    brew install --cask docker
     logg info 'Opening the Docker for Desktop app so that the Docker engine starts running'
     open --background -a Docker
 elif command -v apt-get > /dev/null; then
diff --git a/home/.chezmoiscripts/archlinux/run_onchange_before_10-install-archlinux-dependencies.tmpl b/home/.chezmoiscripts/archlinux/run_onchange_before_10-install-archlinux-dependencies.tmpl
index 724ac4bb..e691a951 100644
--- a/home/.chezmoiscripts/archlinux/run_onchange_before_10-install-archlinux-dependencies.tmpl
+++ b/home/.chezmoiscripts/archlinux/run_onchange_before_10-install-archlinux-dependencies.tmpl
@@ -3,7 +3,7 @@
 # universal/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "universal" "common-dependencies") | sha256sum }}
 # archlinux/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "archlinux" "common-dependencies") | sha256sum }}
 
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/logg-before" }}
 
 {{- $packages := splitList " " (includeTemplate "universal/common-dependencies" .) -}}
 {{- $additionalPackages := splitList " " (includeTemplate "archlinux/common-dependencies" .) -}}
diff --git a/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl b/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl
index c0cc5d68..8c758095 100644
--- a/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl
+++ b/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl
@@ -3,7 +3,7 @@
 # universal/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "universal" "common-dependencies") | sha256sum }}
 # centos/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "centos" "common-dependencies") | sha256sum }}
 
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/logg-before" }}
 
 {{- $packages := splitList " " (includeTemplate "universal/common-dependencies" .) -}}
 {{- $additionalPackages := splitList " " (includeTemplate "centos/common-dependencies" .) -}}
diff --git a/home/.chezmoiscripts/darwin/run_onchange_before_10-install-darwin-dependencies.tmpl b/home/.chezmoiscripts/darwin/run_onchange_before_10-install-darwin-dependencies.tmpl
index 8f46c9a0..5ee4b919 100644
--- a/home/.chezmoiscripts/darwin/run_onchange_before_10-install-darwin-dependencies.tmpl
+++ b/home/.chezmoiscripts/darwin/run_onchange_before_10-install-darwin-dependencies.tmpl
@@ -2,8 +2,8 @@
 
 # darwin/Brewfile hash: {{ include (joinPath ".chezmoitemplates" "darwin" "Brewfile") | sha256sum }}
 
-{{ includeTemplate "universal/profile-bundle" }}
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/profile-before" }}
+{{ includeTemplate "universal/logg-before" }}
 
 if command -v brew > /dev/null; then
   logg 'Installing base dependencies for macOS using `brew bundle`'
diff --git a/home/.chezmoiscripts/darwin/run_onchange_before_20-ensure-user-group.tmpl b/home/.chezmoiscripts/darwin/run_onchange_before_20-ensure-user-group.tmpl
index 551b630b..0668c4be 100644
--- a/home/.chezmoiscripts/darwin/run_onchange_before_20-ensure-user-group.tmpl
+++ b/home/.chezmoiscripts/darwin/run_onchange_before_20-ensure-user-group.tmpl
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-{{ includeTemplate "universal/profile-bundle" }}
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/profile-before" }}
+{{ includeTemplate "universal/logg-before" }}
 
 ### Ensure user has group of same name (required for Macports)
 logg info 'Ensuring user has a group with the same name and that it is a member. Sudo privileges may be required'
diff --git a/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl b/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl
index 71f546a9..0bc497fc 100644
--- a/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl
+++ b/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl
@@ -3,7 +3,7 @@
 # universal/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "universal" "common-dependencies") | sha256sum }}
 # debian/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "debian" "common-dependencies") | sha256sum }}
 
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/logg-before" }}
 
 {{- $packages := splitList " " (includeTemplate "universal/common-dependencies" .) -}}
 {{- $additionalPackages := splitList " " (includeTemplate "debian/common-dependencies" .) -}}
diff --git a/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl b/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl
index 7e205ede..1e59e7d7 100644
--- a/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl
+++ b/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl
@@ -3,7 +3,7 @@
 # universal/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "universal" "common-dependencies") | sha256sum }}
 # fedora/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "fedora" "common-dependencies") | sha256sum }}
 
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/logg-before" }}
 
 {{- $packages := splitList " " (includeTemplate "universal/common-dependencies" .) -}}
 {{- $additionalPackages := splitList " " (includeTemplate "fedora/common-dependencies" .) -}}
diff --git a/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl b/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl
index c5fdb99c..3d2e97f0 100644
--- a/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl
+++ b/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl
@@ -3,7 +3,7 @@
 # universal/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "universal" "common-dependencies") | sha256sum }}
 # freebsd/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "freebsd" "common-dependencies") | sha256sum }}
 
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/logg-before" }}
 
 {{- $packages := splitList " " (includeTemplate "universal/common-dependencies" .) -}}
 {{- $additionalPackages := splitList " " (includeTemplate "freebsd/common-dependencies" .) -}}
diff --git a/home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.tmpl b/home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.tmpl
index 03c5b240..ade7eab5 100644
--- a/home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.tmpl
+++ b/home/.chezmoiscripts/linux/run_onchange_before_10-system-tweaks.tmpl
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-{{ includeTemplate "universal/profile-bundle" }}
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/profile-before" }}
+{{ includeTemplate "universal/logg-before" }}
 
 ### Set hostname (if redefined)
 if command -v hostnamectl > /dev/null; then
diff --git a/home/.chezmoiscripts/linux/run_onchange_before_11-configure-swap.tmpl b/home/.chezmoiscripts/linux/run_onchange_before_11-configure-swap.tmpl
index 18f90d1a..f6547938 100644
--- a/home/.chezmoiscripts/linux/run_onchange_before_11-configure-swap.tmpl
+++ b/home/.chezmoiscripts/linux/run_onchange_before_11-configure-swap.tmpl
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 # TODO - make equivalent to https://gitlab.com/megabyte-labs/gas-station/-/blob/master/roles/system/common/tasks/linux/swap.yml
 
-{{ includeTemplate "universal/profile-bundle" }}
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/profile-before" }}
+{{ includeTemplate "universal/logg-before" }}
 
 if [ ! -f /swapfile ]; then
   MEMORY_IN_KB="$(grep MemTotal /proc/meminfo | sed 's/.* \(.*\) kB/\1/')"
diff --git a/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl b/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl
index 82b6277a..74e3cccb 100644
--- a/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl
+++ b/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl
@@ -3,7 +3,7 @@
 # universal/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "universal" "common-dependencies") | sha256sum }}
 # opensuse/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "opensuse" "common-dependencies") | sha256sum }}
 
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/logg-before" }}
 
 {{- $packages := splitList " " (includeTemplate "universal/common-dependencies" .) -}}
 {{- $additionalPackages := splitList " " (includeTemplate "opensuse/common-dependencies" .) -}}
diff --git a/home/.chezmoiscripts/ubuntu/run_onchange_before_10-install-ubuntu-dependencies.tmpl b/home/.chezmoiscripts/ubuntu/run_onchange_before_10-install-ubuntu-dependencies.tmpl
index 6ea861ca..d70b572f 100644
--- a/home/.chezmoiscripts/ubuntu/run_onchange_before_10-install-ubuntu-dependencies.tmpl
+++ b/home/.chezmoiscripts/ubuntu/run_onchange_before_10-install-ubuntu-dependencies.tmpl
@@ -3,7 +3,7 @@
 # universal/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "universal" "common-dependencies") | sha256sum }}
 # ubuntu/common-dependencies hash: {{ include (joinPath ".chezmoitemplates" "ubuntu" "common-dependencies") | sha256sum }}
 
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/logg-before" }}
 
 {{- $packages := splitList " " (includeTemplate "universal/common-dependencies" .) -}}
 {{- $additionalPackages := splitList " " (includeTemplate "ubuntu/common-dependencies" .) -}}
diff --git a/home/.chezmoiscripts/universal/run_before_01-decrypt-age-key.tmpl b/home/.chezmoiscripts/universal/run_before_01-decrypt-age-key.tmpl
index 3655e96c..61b763db 100644
--- a/home/.chezmoiscripts/universal/run_before_01-decrypt-age-key.tmpl
+++ b/home/.chezmoiscripts/universal/run_before_01-decrypt-age-key.tmpl
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-{{ includeTemplate "universal/logg-bundle" }}
-{{ includeTemplate "universal/profile-bundle" }}
+{{ includeTemplate "universal/logg-before" }}
+{{ includeTemplate "universal/profile-before" }}
 
 ### Decrypt private key if it is not already present
 if [ ! -f "${XDG_CONFIG_HOME}/age/chezmoi.txt" ]; then
diff --git a/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl
index 87f64e09..9791a76c 100644
--- a/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-{{ includeTemplate "universal/profile-bundle" }}
-{{ includeTemplate "universal/logg-bundle" }}
+{{ includeTemplate "universal/profile-before" }}
+{{ includeTemplate "universal/logg-before" }}
 
 KEYID="{{ .user.gpg.id }}"