diff --git a/roles/netbsd/tasks/packages-cli.yml b/roles/netbsd/tasks/packages-cli.yml
index 41720ef..b43a7b6 100644
--- a/roles/netbsd/tasks/packages-cli.yml
+++ b/roles/netbsd/tasks/packages-cli.yml
@@ -16,5 +16,20 @@
 - name: Install CLI packages
   become: true
   pkgin:
-    name: ansible,git,gnupg2,mc,mozilla-rootcerts-openssl,nmap,openvpn,pkgin,py37-pip,python37,sqlite3,sudo,zsh
+    name: '{{ packages }}'
     state: present
+  vars:
+    packages:
+      - ansible
+      - git
+      - gnupg2
+      - mc
+      - mozilla-rootcerts-openssl
+      - nmap
+      - openvpn
+      - pkgin
+      - py37-pip
+      - python37
+      - sqlite3
+      - sudo
+      - zsh
diff --git a/roles/netbsd/tasks/packages-gui.yml b/roles/netbsd/tasks/packages-gui.yml
index 0613895..e23f9eb 100644
--- a/roles/netbsd/tasks/packages-gui.yml
+++ b/roles/netbsd/tasks/packages-gui.yml
@@ -2,5 +2,16 @@
 - name: Install GUI packages
   become: true
   pkgin:
-    name: adwaita-icon-theme,atril,firefox,fvwm,liberation-ttf,mate-terminal,rxvt-unicode,vim-gtk3,xlockmore-lite
+    name: '{{ packages }}'
     state: present
+  vars:
+    packages:
+      - adwaita-icon-theme
+      - atril
+      - firefox
+      - fvwm
+      - liberation-ttf
+      - mate-terminal
+      - rxvt-unicode
+      - vim-gtk3
+      - xlockmore-lite