diff --git a/scripts/gpg.integrate-ssh.fish b/scripts/gpg.integrate-ssh.fish
index eefd616..69a74e1 100644
--- a/scripts/gpg.integrate-ssh.fish
+++ b/scripts/gpg.integrate-ssh.fish
@@ -1,7 +1,5 @@
 #!/usr/bin/env fish
 
-gpg-connect-agent updatestartuptty /bye
-set SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
-export SSH_AUTH_SOCK
-set GPG_TTY (tty)
-export GPG_TTY
+gpg-connect-agent updatestartuptty '/bye'
+set -x 'SSH_AUTH_SOCK' (gpgconf --list-dirs 'agent-ssh-socket')
+set -x 'GPG_TTY' (tty)
diff --git a/scripts/raspberry pi os/docker.install.bash b/scripts/raspberry pi os/docker.install.bash
deleted file mode 100755
index 12c9313..0000000
--- a/scripts/raspberry pi os/docker.install.bash	
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-sudo curl -fsSL https://get.docker.com | sh -
-sudo usermod -aG docker $USER
-
-# logout && login to apply the new status
-
-docker run --rm --name test hello-world && docker rmi hello-world
diff --git a/scripts/boinc.static-frequency-for-niced-loads.sh b/snippets/boinc.static-frequency-for-niced-loads.sh
similarity index 100%
rename from scripts/boinc.static-frequency-for-niced-loads.sh
rename to snippets/boinc.static-frequency-for-niced-loads.sh
diff --git a/scripts/git.change-the-default-branch-from-master-to-main.sh b/snippets/git.change-the-default-branch-from-master-to-main.sh
similarity index 72%
rename from scripts/git.change-the-default-branch-from-master-to-main.sh
rename to snippets/git.change-the-default-branch-from-master-to-main.sh
index b85df4d..a6bb3e8 100755
--- a/scripts/git.change-the-default-branch-from-master-to-main.sh
+++ b/snippets/git.change-the-default-branch-from-master-to-main.sh
@@ -4,16 +4,16 @@
 # - https://stevenmortimer.com/5-steps-to-change-github-default-branch-from-master-to-main/
 
 # create main branch locally, taking the history from master
-git branch --move master main
+git branch --move 'master' 'main'
 
 # push the new local main branch to the remote repo (GitHub)
-git push --set-upstream origin main
+git push --set-upstream 'origin' 'main'
 
 # switch the current HEAD to the main branch
-git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
+git symbolic-ref 'refs/remotes/origin/HEAD' 'refs/remotes/origin/main'
 
 # change the default branch on GitHub to main
 # https://docs.github.com/en/github/administering-a-repository/setting-the-default-branch
 
 # delete the master branch on the remote
-git push origin --delete master
+git push origin --delete 'master'
diff --git a/scripts/k3s/install.bash b/snippets/k3s.install.bash
similarity index 100%
rename from scripts/k3s/install.bash
rename to snippets/k3s.install.bash
diff --git a/scripts/raspberry pi os/boinc-client.setup.bash b/snippets/raspberry pi os/boinc-client.setup.bash
similarity index 100%
rename from scripts/raspberry pi os/boinc-client.setup.bash
rename to snippets/raspberry pi os/boinc-client.setup.bash
diff --git a/snippets/raspberry pi os/docker.install.bash b/snippets/raspberry pi os/docker.install.bash
new file mode 100755
index 0000000..c2817b6
--- /dev/null
+++ b/snippets/raspberry pi os/docker.install.bash	
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+sudo curl -fsSL 'https://get.docker.com' | sh -
+sudo usermod -aG 'docker' "$USER"
+
+# logout && login to apply the new status
+
+docker run --rm --name 'test' 'hello-world' && docker rmi 'hello-world'
diff --git a/scripts/raspberry pi os/frankendebian.setup.sh b/snippets/raspberry pi os/frankendebian.setup.sh
similarity index 100%
rename from scripts/raspberry pi os/frankendebian.setup.sh
rename to snippets/raspberry pi os/frankendebian.setup.sh
diff --git a/scripts/raspberry pi os/git.install-from-source.sh b/snippets/raspberry pi os/git.install-from-source.sh
similarity index 100%
rename from scripts/raspberry pi os/git.install-from-source.sh
rename to snippets/raspberry pi os/git.install-from-source.sh
diff --git a/scripts/raspberry pi os/raspbian.list.template b/snippets/raspberry pi os/raspbian.list.template
similarity index 100%
rename from scripts/raspberry pi os/raspbian.list.template
rename to snippets/raspberry pi os/raspbian.list.template
diff --git a/scripts/turris-os.create-container.sh b/snippets/turris-os.create-container.sh
similarity index 93%
rename from scripts/turris-os.create-container.sh
rename to snippets/turris-os.create-container.sh
index 13582d2..92925ee 100644
--- a/scripts/turris-os.create-container.sh
+++ b/snippets/turris-os.create-container.sh
@@ -2,7 +2,7 @@
 
 lxc-create -n 'alpine' -t 'download' -- -d 'Alpine' -r '3.18' -a 'armv7l'
 
-uci add dhcp host
+uci add dhcp 'host'
 uci set dhcp.@host[-1].name='alpine'
 uci set dhcp.@host[-1].mac="$(grep 'hwaddr' '/srv/lxc/alpine/config' | sed 's/.*= //')"
 uci set dhcp.@host[-1].ip='192.168.111.2'
diff --git a/scripts/turris-os.start-container-at-boot.sh b/snippets/turris-os.start-container-at-boot.sh
similarity index 100%
rename from scripts/turris-os.start-container-at-boot.sh
rename to snippets/turris-os.start-container-at-boot.sh
diff --git a/scripts/ubuntu linux/docker.install.sh b/snippets/ubuntu.docker.install.sh
similarity index 100%
rename from scripts/ubuntu linux/docker.install.sh
rename to snippets/ubuntu.docker.install.sh