diff --git a/local.yml b/local.yml
index efb0a64..f81131a 100644
--- a/local.yml
+++ b/local.yml
@@ -21,19 +21,25 @@
       ignore_errors: yes
 
 
-# Desktops and laptops
+# Linux Desktops and laptops
 - name: UI Setup
   hosts: workstation
   connection: local
   become: true
+  when: ansible_distribution != "FreeBSD"
 
   tasks:
     - include: tasks/flatpaks.yml
-      when: ansible_distribution != "FreeBSD"
+
+# FreeBSD Desktops and laptops
+- name: FreeBSD UI Setup
+  hosts: workstation
+  connection: local
+  become: true
+  when: ansible_distribution == "FreeBSD"
 
   tasks:
     - include: tasks/freebsd_gui.yml
-      when: ansible_distribution == "FreeBSD"
 
 
 # Run hardness checks