diff --git a/home/.chezmoiscripts/_universal/run_before_01-add-temporary-includes.sh.tmpl b/home/.chezmoiscripts/universal/run_before_01-add-temporary-includes.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/_universal/run_before_01-add-temporary-includes.sh.tmpl
rename to home/.chezmoiscripts/universal/run_before_01-add-temporary-includes.sh.tmpl
diff --git a/home/.chezmoiscripts/_universal/run_onchange_before_05-install-homebrew.sh.tmpl b/home/.chezmoiscripts/universal/run_before_01-install-homebrew.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/_universal/run_onchange_before_05-install-homebrew.sh.tmpl
rename to home/.chezmoiscripts/universal/run_before_01-install-homebrew.sh.tmpl
diff --git a/home/.chezmoiscripts/universal/run_before_01-decrypt-age-key.sh.tmpl b/home/.chezmoiscripts/universal/run_before_02-decrypt-age-key.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/universal/run_before_01-decrypt-age-key.sh.tmpl
rename to home/.chezmoiscripts/universal/run_before_02-decrypt-age-key.sh.tmpl
diff --git a/home/.chezmoiscripts/qubes/run_onchange_after_11-set-wallpaper.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_11-set-wallpaper.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/qubes/run_onchange_after_11-set-wallpaper.sh.tmpl
rename to home/.chezmoiscripts/universal/run_onchange_after_11-set-wallpaper.sh.tmpl
diff --git a/home/.chezmoiscripts/qubes/run_onchange_before_12-update-dom0.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_12-update-dom0.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/qubes/run_onchange_before_12-update-dom0.sh.tmpl
rename to home/.chezmoiscripts/universal/run_onchange_before_12-update-dom0.sh.tmpl
diff --git a/home/.chezmoiscripts/qubes/run_onchange_before_13-install-official-templates.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_13-install-official-templates.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/qubes/run_onchange_before_13-install-official-templates.sh.tmpl
rename to home/.chezmoiscripts/universal/run_onchange_before_13-install-official-templates.sh.tmpl
diff --git a/home/.chezmoiscripts/qubes/run_onchange_before_14-ensure-minimal-vms-passwordless.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_14-ensure-minimal-vms-passwordless.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/qubes/run_onchange_before_14-ensure-minimal-vms-passwordless.sh.tmpl
rename to home/.chezmoiscripts/universal/run_onchange_before_14-ensure-minimal-vms-passwordless.sh.tmpl
diff --git a/home/.chezmoiscripts/qubes/run_onchange_before_15-install-unofficial-templates.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_15-install-unofficial-templates.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/qubes/run_onchange_before_15-install-unofficial-templates.sh.tmpl
rename to home/.chezmoiscripts/universal/run_onchange_before_15-install-unofficial-templates.sh.tmpl
diff --git a/home/.chezmoiscripts/qubes/run_onchange_before_16-update-template-vms.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_16-update-template-vms.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/qubes/run_onchange_before_16-update-template-vms.sh.tmpl
rename to home/.chezmoiscripts/universal/run_onchange_before_16-update-template-vms.sh.tmpl
diff --git a/home/.chezmoiscripts/qubes/run_onchange_before_17-install-mirage-firewall.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_17-install-mirage-firewall.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/qubes/run_onchange_before_17-install-mirage-firewall.sh.tmpl
rename to home/.chezmoiscripts/universal/run_onchange_before_17-install-mirage-firewall.sh.tmpl
diff --git a/home/.chezmoiscripts/qubes/run_onchange_before_18-configure-sys-usb.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_18-configure-sys-usb.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/qubes/run_onchange_before_18-configure-sys-usb.sh.tmpl
rename to home/.chezmoiscripts/universal/run_onchange_before_18-configure-sys-usb.sh.tmpl
diff --git a/home/.chezmoiscripts/qubes/run_onchange_before_19-setup-sys-gui.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_19-setup-sys-gui.sh.tmpl
similarity index 100%
rename from home/.chezmoiscripts/qubes/run_onchange_before_19-setup-sys-gui.sh.tmpl
rename to home/.chezmoiscripts/universal/run_onchange_before_19-setup-sys-gui.sh.tmpl
diff --git a/scripts/cloudflared-ssh.sh b/scripts/cloudflared-ssh.sh
index 4b918cbb..240beba9 100644
--- a/scripts/cloudflared-ssh.sh
+++ b/scripts/cloudflared-ssh.sh
@@ -140,9 +140,9 @@ if [ -n "$TUNNEL_ID" ]; then
     DOMAINS_HOSTED="$(find /opt/easyengine/sites -maxdepth 1 -mindepth 1 -type d | sed 's/.*sites\///' | xargs)"
   else
     if [ -d /etc/qubes ]; then
-      DOMAINS_HOSTED="$(hostname)-qube.${SSH_DOMAIN:-ssh.megabyte.spaccec}"
+      DOMAINS_HOSTED="$(hostname)-qube.${SSH_DOMAIN:-ssh.megabyte.space}"
     else
-      DOMAINS_HOSTED="$(hostname).${SSH_DOMAIN:-ssh.megabyte.spaccec}"
+      DOMAINS_HOSTED="$(hostname).${SSH_DOMAIN:-ssh.megabyte.space}"
     fi
   fi
   for DOMAIN in $DOMAINS_HOSTED; do
diff --git a/scripts/src/cloudflared-ssh.sh.tmpl b/scripts/src/cloudflared-ssh.sh.tmpl
index 2647a08c..f74947ca 100644
--- a/scripts/src/cloudflared-ssh.sh.tmpl
+++ b/scripts/src/cloudflared-ssh.sh.tmpl
@@ -79,9 +79,9 @@ if [ -n "$TUNNEL_ID" ]; then
     DOMAINS_HOSTED="$(find /opt/easyengine/sites -maxdepth 1 -mindepth 1 -type d | sed 's/.*sites\///' | xargs)"
   else
     if [ -d /etc/qubes ]; then
-      DOMAINS_HOSTED="$(hostname)-qube.${SSH_DOMAIN:-ssh.megabyte.spaccec}"
+      DOMAINS_HOSTED="$(hostname)-qube.${SSH_DOMAIN:-ssh.megabyte.space}"
     else
-      DOMAINS_HOSTED="$(hostname).${SSH_DOMAIN:-ssh.megabyte.spaccec}"
+      DOMAINS_HOSTED="$(hostname).${SSH_DOMAIN:-ssh.megabyte.space}"
     fi
   fi
   for DOMAIN in $DOMAINS_HOSTED; do