diff --git a/home/.chezmoi.yaml.tmpl b/home/.chezmoi.yaml.tmpl
index 73ed0a3..3cd5e3f 100644
--- a/home/.chezmoi.yaml.tmpl
+++ b/home/.chezmoi.yaml.tmpl
@@ -32,108 +32,6 @@ data:
     # Machine-specific flags
     common:
         defaultShell: zsh
-        packages:
-            brewTaps:
-                - jesseduffield/lazygit
-                - zunit-zsh/zunit
-            brewCaskTaps:
-            brew:
-                - act
-                - antidote
-                - atuin
-                - bat
-                - btop
-                - cheat
-                - dive
-                - duckdb
-                - eza
-                - fastfetch
-                - fd
-                - figlet
-                - fzf
-                - gh
-                - git-delta
-                - go
-                - grep
-                - htop
-                - humanlog
-                - jesseduffield/lazygit/lazygit
-                - jq
-                - lazydocker
-                - neovim
-                - nmap
-                - nvim
-                - nvm
-                - rclone
-                - ripgrep
-                - screen
-                - starship
-                - tig
-                - tmux
-                - vim
-                - wget
-                - yazi
-                - yq
-                - zoxide
-                - zsh
-            brewCask:
-                - firefox
-                - gimp
-                - ghostty
-                - spotify
-                - visual-studio-code
-                - vlc
-            flatpak:
-                - com.brave.Browser
-                - com.discordapp.Discord
-                - com.google.Chrome
-                - com.mattjakeman.ExtensionManager
-                - com.slack.Slack
-                - com.spotify.Client
-                - com.visualstudio.code
-                - md.obsidian.Obsidian
-                - org.gimp.GIMP
-                - org.localsend.localsend_app
-                - org.mozilla.firefox
-                - org.telegram.desktop
-                - org.videolan.VLC
-                - us.zoom.Zoom
-    hosts:
-        ci:
-            packages:
-                brew:
-                    - hello
-        coffee-sponge:
-            packages:
-                flatpak:
-                    - com.valvesoftware.Steam
-        grease-monkey:
-            packages:
-                brew:
-                    - tailscale
-                flatpak:
-        mac-4981:
-            packages:
-                brew:
-                    - awscli
-                    - awscli-local
-                    - aws-sam-cli
-                    - trivy
-                brewTaps:
-                brewCaskTaps:
-                brewCask:
-                    - caffeine
-                    - gas-mask
-                    - jordanbaird-ice
-                    - m-cli
-                    - mas
-                    - microsoft-edge
-                    - obsidian
-                    - raycast
-                    - rectangle
-                    - slack
-                    - stats
-                    - visual-studio-code
 env:
     OS: "{{ .chezmoi.os }}"
     OS_DISTRO: "{{ $osid }}"
diff --git a/home/.chezmoidata/packages.yml b/home/.chezmoidata/packages.yml
new file mode 100644
index 0000000..08bfec0
--- /dev/null
+++ b/home/.chezmoidata/packages.yml
@@ -0,0 +1,98 @@
+common:
+    brewTaps:
+        - jesseduffield/lazygit
+        - zunit-zsh/zunit
+    brewCaskTaps:
+    brew:
+        - act
+        - antidote
+        - atuin
+        - bat
+        - btop
+        - cheat
+        - dive
+        - duckdb
+        - eza
+        - fastfetch
+        - fd
+        - figlet
+        - fzf
+        - gh
+        - git-delta
+        - go
+        - grep
+        - htop
+        - humanlog
+        - jesseduffield/lazygit/lazygit
+        - jq
+        - lazydocker
+        - neovim
+        - nmap
+        - nvim
+        - nvm
+        - rclone
+        - ripgrep
+        - screen
+        - starship
+        - tig
+        - tmux
+        - vim
+        - wget
+        - yazi
+        - yq
+        - zoxide
+        - zsh
+    brewCask:
+        - firefox
+        - gimp
+        - ghostty
+        - spotify
+        - visual-studio-code
+        - vlc
+    flatpak:
+        - com.brave.Browser
+        - com.discordapp.Discord
+        - com.google.Chrome
+        - com.mattjakeman.ExtensionManager
+        - com.slack.Slack
+        - com.spotify.Client
+        - com.visualstudio.code
+        - md.obsidian.Obsidian
+        - org.gimp.GIMP
+        - org.localsend.localsend_app
+        - org.mozilla.firefox
+        - org.telegram.desktop
+        - org.videolan.VLC
+        - us.zoom.Zoom
+hosts:
+    ci:
+        brew:
+            - hello
+    coffee-sponge:
+        flatpak:
+            - com.valvesoftware.Steam
+    grease-monkey:
+        brew:
+            - tailscale
+        flatpak:
+    mac-4981:
+        brew:
+            - awscli
+            - awscli-local
+            - aws-sam-cli
+            - trivy
+        brewTaps:
+        brewCaskTaps:
+        brewCask:
+            - caffeine
+            - gas-mask
+            - jordanbaird-ice
+            - m-cli
+            - mas
+            - microsoft-edge
+            - obsidian
+            - raycast
+            - rectangle
+            - slack
+            - stats
+            - visual-studio-code
diff --git a/home/.chezmoitemplates/brew/base.brew.tmpl b/home/.chezmoitemplates/brew/base.brew.tmpl
index b551571..c42fad9 100644
--- a/home/.chezmoitemplates/brew/base.brew.tmpl
+++ b/home/.chezmoitemplates/brew/base.brew.tmpl
@@ -1,25 +1,25 @@
 ## Common packages
-{{- $commonConfig := .common }}
-{{- if hasKey $commonConfig.packages "brewTaps" }}
-{{- range $commonConfig.packages.brewTaps }}
+{{- $commonConfig := .packages.common }}
+{{- if hasKey $commonConfig "brewTaps" }}
+{{- range $commonConfig.brewTaps }}
 tap "{{ . }}"
 {{- end }}
 {{- end }}
-{{- if hasKey $commonConfig.packages "brew" }}
-{{- range $commonConfig.packages.brew }}
+{{- if hasKey $commonConfig "brew" }}
+{{- range $commonConfig.brew }}
 brew "{{ . }}"
 {{- end }}
 {{- end }}
 
 ## Machine Specific packages: {{- .hostname }}
-{{- $hostConfig := get .hosts .hostname }}
-{{- if (and (hasKey $hostConfig "packages") (hasKey $hostConfig.packages "brewTaps")) }}
-{{- range $hostConfig.packages.brewTaps }}
+{{- $hostConfig := get .packages.hosts .hostname }}
+{{- if (hasKey $hostConfig "brewTaps") }}
+{{- range $hostConfig.brewTaps }}
 tap "{{ . }}"
 {{- end }}
 {{- end }}
-{{- if (and (hasKey $hostConfig "packages") (hasKey $hostConfig.packages "brew")) }}
-{{- range $hostConfig.packages.brew }}
+{{- if (hasKey $hostConfig "brew") }}
+{{- range $hostConfig.brew }}
 brew "{{ . }}"
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/home/.chezmoitemplates/brew/cask.brew.tmpl b/home/.chezmoitemplates/brew/cask.brew.tmpl
index f6ef317..f07edf8 100644
--- a/home/.chezmoitemplates/brew/cask.brew.tmpl
+++ b/home/.chezmoitemplates/brew/cask.brew.tmpl
@@ -1,28 +1,28 @@
 {{ if eq .chezmoi.config.env.OS "darwin" }}
 ## Common casks
-{{- $commonConfig := .common }}
-{{- if hasKey $commonConfig.packages "brewCaskTaps" }}
-{{- range $commonConfig.packages.brewCaskTaps }}
+{{- $commonConfig := .packages.common }}
+{{- if hasKey $commonConfig "brewCaskTaps" }}
+{{- range $commonConfig.brewCaskTaps }}
 tap "{{ . }}"
 {{- end }}
 {{- end }}
-{{- if hasKey $commonConfig.packages "brewCask" }}
-{{- range $commonConfig.packages.brewCask }}
+{{- if hasKey $commonConfig "brewCask" }}
+{{- range $commonConfig.brewCask }}
 cask "{{ . }}"
 {{- end }}
 {{- end }}
 
 ## Machine Specific casks: {{- .hostname }}
-{{- $hostConfig := get .hosts .hostname }}
-{{- if (and (hasKey $hostConfig "packages") (hasKey $hostConfig.packages "brewCaskTaps")) }}
-{{- range $hostConfig.packages.brewCaskTaps }}
+{{- $hostConfig := get .packages.hosts .hostname }}
+{{- if (hasKey $hostConfig "brewCaskTaps") }}
+{{- range $hostConfig.brewCaskTaps }}
 tap "{{ . }}"
 {{- end }}
 {{- end }}
-{{- if (and (hasKey $hostConfig "packages") (hasKey $hostConfig.packages "brewCask")) }}
-{{- range $hostConfig.packages.brewCask }}
+{{- if (hasKey $hostConfig "brewCask") }}
+{{- range $hostConfig.brewCask }}
 cask "{{ . }}"
 {{- end }}
 {{- end }}
 
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/home/.chezmoitemplates/brew/flatpak.brew.tmpl b/home/.chezmoitemplates/brew/flatpak.brew.tmpl
index 87a9676..ec02979 100644
--- a/home/.chezmoitemplates/brew/flatpak.brew.tmpl
+++ b/home/.chezmoitemplates/brew/flatpak.brew.tmpl
@@ -1,19 +1,19 @@
 {{ if eq .chezmoi.config.env.OS "linux" }}
 ## Common flatpaks
-{{- $commonConfig := .common }}
-{{- if hasKey $commonConfig.packages "flatpak" }}
-{{- range $commonConfig.packages.flatpak }}
+{{- $commonConfig := .packages.common }}
+{{- if hasKey $commonConfig "flatpak" }}
+{{- range $commonConfig.flatpak }}
 flatpak "{{ . }}"
 {{- end }}
 {{- end }}
 
 ## Machine Specific flatpaks: {{- .hostname }}
-{{- $hostConfig := get .hosts .hostname }}
-{{- if (and (hasKey $hostConfig "packages") (hasKey $hostConfig.packages "flatpak")) }}
-{{- range $hostConfig.packages.flatpak }}
+{{- $hostConfig := get .packages.hosts .hostname }}
+{{- if (hasKey $hostConfig "flatpak") }}
+{{- range $hostConfig.flatpak }}
 flatpak "{{ . }}"
 {{- end }}
 {{- end }}
 {{- else }}
 # Flatpak is not available or not executable on this system, skipping flatpak packages.
-{{- end }}
\ No newline at end of file
+{{- end }}