diff --git a/roles/distro-gui/tasks/main.yml b/roles/distro-gui/tasks/main.yml
index ee52af3..a3b5dd5 100644
--- a/roles/distro-gui/tasks/main.yml
+++ b/roles/distro-gui/tasks/main.yml
@@ -1,5 +1,7 @@
 ---
 - include: debian.yml
   when: ansible_distribution == 'Debian'
+- include: ubuntu.yml
+  when: ansible_distribution == 'Ubuntu'
 - include: freebsd.yml
   when: ansible_distribution == 'FreeBSD'
diff --git a/roles/distro-gui/tasks/ubuntu.yml b/roles/distro-gui/tasks/ubuntu.yml
new file mode 100644
index 0000000..fbf66f0
--- /dev/null
+++ b/roles/distro-gui/tasks/ubuntu.yml
@@ -0,0 +1,24 @@
+---
+- name: Install Ubuntu GUI packages
+  become: true
+  apt:
+    name: '{{ packages }}'
+    state: present
+    force_apt_get: yes
+  vars:
+    packages:
+      - caja-open-terminal
+      - dconf-cli
+      - emacs
+      - evolution
+      - galculator
+      - git-gui
+      - mpv
+      - nextcloud-desktop
+      - redshift-gtk
+      - remmina
+      - rxvt-unicode
+      - seahorse
+      - vim-gtk
+      - xinput
+      - xterm
diff --git a/roles/distro/tasks/main.yml b/roles/distro/tasks/main.yml
index 915e83f..5aa8445 100644
--- a/roles/distro/tasks/main.yml
+++ b/roles/distro/tasks/main.yml
@@ -1,6 +1,8 @@
 ---
 - include: debian.yml
   when: ansible_distribution == 'Debian'
+- include: ubuntu.yml
+  when: ansible_distribution == 'Ubuntu'
 - include: freebsd.yml
   when: ansible_distribution == 'FreeBSD'
 - include: modules.yml
diff --git a/roles/distro/tasks/ubuntu.yml b/roles/distro/tasks/ubuntu.yml
new file mode 100644
index 0000000..aa4c17d
--- /dev/null
+++ b/roles/distro/tasks/ubuntu.yml
@@ -0,0 +1,32 @@
+---
+- name: Install Ubuntu CLI packages
+  become: true
+  apt:
+    name: '{{ packages }}'
+    state: present
+    force_apt_get: yes
+  vars:
+    packages:
+      - apt-file
+      - ansible
+      - asciidoctor
+      - build-essential
+      - dc
+      - devscripts
+      - dnsutils
+      - git
+      - gnupg
+      - mc
+      - nmap
+      - openssh-server
+      - packagekit
+      - python3
+      - python3-psutil
+      - ruby-asciidoctor-pdf
+      - sqlite3
+      - sudo
+      - tlp
+      - tmux
+      - vim
+      - wordgrinder-ncurses
+      - zsh