diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies
new file mode 100644
index 00000000..e56f469a
--- /dev/null
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies
@@ -0,0 +1,4 @@
+{{- if eq .host.distro.id "opensuse" }}
+{{ $supportedManagers := (list "whalebrew" "pkg" "go" "cargo" "npm" "gem") }}
+#!/usr/bin/env bash
+{{- end -}}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages
index e56f469a..48fb26fe 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages
@@ -1,4 +1,17 @@
-{{- if eq .host.distro.id "opensuse" }}
-{{ $supportedManagers := (list "whalebrew" "pkg" "go" "cargo" "npm" "gem") }}
+{{- if eq .host.distro.id "freebsd" }}
 #!/usr/bin/env bash
+
+# Required for styled logging
+{{- includeTemplate "universal/logg" }}
+
+{{- $packages := splitList " " (includeTemplate "universal/essential-packages" .) }}
+# TODO - Add Python dependencies like in ubuntu/archlinux
+
+logg 'Installing common dependencies using pkg'
+logg "Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}"
+
+### Install base dependencies
+sudo pkg install -y {{ $packages | sortAlpha | uniq | join " " -}}
+
 {{- end -}}
+
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software
new file mode 100644
index 00000000..848922d0
--- /dev/null
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software
@@ -0,0 +1,16 @@
+{{- if eq .host.distro.id "opensuse" }}
+#!/usr/bin/env bash
+
+# Required for styled logging
+{{- includeTemplate "universal/logg" }}
+
+{{- $packages := splitList " " (includeTemplate "universal/essential-packages" .) }}
+# TODO - Add Python dependencies like in ubuntu/archlinux
+
+logg 'Installing common dependencies using zypper'
+logg "Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}"
+
+### Install base dependencies
+sudo zypper install -y {{ $packages | sortAlpha | uniq | join " " -}}
+
+{{- end -}}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies
new file mode 100644
index 00000000..51c8a93f
--- /dev/null
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies
@@ -0,0 +1,2 @@
+{{- if eq .host.distro.id "windows" }}
+{{- end -}}
\ No newline at end of file
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages
index 08c790f8..b1a28e03 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages
@@ -1,4 +1,4 @@
-{{- if eq .host.distro.id "ubuntu" }}
+{{- if eq .host.distro.id "windows" }}
 {{ $supportedManagers := (list "whalebrew" "choco" "scoop" "winget" "go" "cargo" "npm" "pipx" "gem" "binary") }}
 
 {{- end -}}