diff --git a/roles/netbsd/tasks/main.yml b/roles/netbsd/tasks/main.yml
index 9b892eb..0f46d09 100644
--- a/roles/netbsd/tasks/main.yml
+++ b/roles/netbsd/tasks/main.yml
@@ -17,6 +17,5 @@
 - import_tasks: packages-gui.yml
   when: gui == true
 - import_tasks: sudo.yml
-- import_tasks: console.yml
 - import_tasks: xorg.yml
   when: gui == true
diff --git a/roles/netbsd/tasks/packages-cli.yml b/roles/netbsd/tasks/packages-cli.yml
index cbce3ea..7dd6d16 100644
--- a/roles/netbsd/tasks/packages-cli.yml
+++ b/roles/netbsd/tasks/packages-cli.yml
@@ -34,17 +34,11 @@
     state: present
   vars:
     packages:
-      - bash
+      - curl
       - git
-      - gnupg2
-      - heirloom-doctools
       - mc
-      - mozilla-rootcerts-openssl
       - nmap
-      - openvpn
       - pkgin
-      - py37-pip
-      - python37
-      - ruby
       - sqlite3
       - sudo
+      - vim
diff --git a/roles/netbsd/tasks/packages-gui.yml b/roles/netbsd/tasks/packages-gui.yml
index b408766..b6357f0 100644
--- a/roles/netbsd/tasks/packages-gui.yml
+++ b/roles/netbsd/tasks/packages-gui.yml
@@ -20,10 +20,10 @@
     state: present
   vars:
     packages:
-      - adwaita-icon-theme
-      - emacs
-      - firefox
-      - gettext-lib
-      - liberation-ttf
-      - xfce4
-      - vim-gtk3
+      - dbus
+      - firefox-esr
+      - fvwm3
+      - intel-backlight
+      - keepassxc
+      - tigervnc
+      - xlockmore