Starting to test Ubuntu Server. Need to find a way to get it working without putting it in the hosts file.

facts/system.yml

@@ -1,7 +1,7 @@
 ---
 # Define what the file and folder names should be on each OS.
 
-- name: Set Pop!_OS FS Names
+- name: Set Pop!_OS Desktop Facts
   ansible.builtin.set_fact:
     flatpak_distro: yes
     lynis_install_dir: /usr/local/lynis
@@ -11,16 +11,16 @@
 
 
 # TODO Needs tested
-- name: Set Ubuntu FS Names
+- name: Set Debian+Ubuntu Server Facts
   ansible.builtin.set_fact:
     flatpak_distro: yes
     lynis_install_dir: /usr/local/lynis
     lynis_report: /root/lynis.log
     sudoers_install_dir: /etc/sudoers.d/ansible
-  when: ansible_distribution == "Ubuntu"
+  when: ansible_distribution in ("Debian","Ubuntu")
 
 
-- name: Set FreeBSD FS Names
+- name: Set FreeBSD Facts
   ansible.builtin.set_fact:
     flatpak_distro: no
     lynis_install_dir: /usr/local/lynis

facts/user.yml

@@ -3,15 +3,10 @@
 
 - name: Set Linux User Variables
   ansible.builtin.set_fact:
-    root: root
     root_group: root
-    ansible: ansible
-  when: ansible_distribution == "Pop!_OS" or
-        ansible_distribution == "Ubuntu"
+  when: ansible_system == "Linux"
 
 - name: Set FreeBSD User Variables
   ansible.builtin.set_fact:
-    root: root
     root_group: wheel
-    ansible: ansible
-  when: ansible_distribution == "FreeBSD"
+  when: ansible_system == "FreeBSD"