diff --git a/facts/filesystem_names.yml b/facts/filesystem_names.yml
index fdcf35c..cba2dec 100644
--- a/facts/filesystem_names.yml
+++ b/facts/filesystem_names.yml
@@ -5,7 +5,7 @@
   ansible.builtin.set_fact:
     lynis_install_dir: /usr/local/lynis
     lynis_report: /home/ling/lynis.log
-    sudoers_install_dir: /etc
+    sudoers_install_dir: /etc/sudoers.d/ansible
   when: ansible_distribution == "Pop!_OS"
 
 
@@ -14,7 +14,7 @@
   ansible.builtin.set_fact:
     lynis_install_dir: /usr/local/lynis
     lynis_report: /root/lynis.log
-    sudoers_install_dir: /etc
+    sudoers_install_dir: /etc/sudoers.d/ansible
   when: ansible_distribution == "Ubuntu"
 
 
@@ -23,5 +23,5 @@
   ansible.builtin.set_fact:
     lynis_install_dir: /usr/local/lynis
     lynis_report: /root/lynis.log
-    sudoers_install_dir: /usr/local/etc
+    sudoers_install_dir: /usr/local/etc/sudoers.d/ansible
   when: ansible_distribution == "FreeBSD"
\ No newline at end of file
diff --git a/facts/package_names.yml b/facts/package_names.yml
index 4d8a630..492a818 100644
--- a/facts/package_names.yml
+++ b/facts/package_names.yml
@@ -3,25 +3,28 @@
 
 - name: Set Pop!_OS Package Names
   ansible.builtin.set_fact:
-    firefox: firefox
+    firefox: firefox-esr
     thunderbird: thunderbird
     evolution: evolution
+    sshfs: sshfs
   when: ansible_distribution == "Pop!_OS"
 
 
 # TODO Needs tested
 - name: Set Ubuntu Package Names
   ansible.builtin.set_fact:
-    firefox: firefox
+    firefox: firefox-esr
     thunderbird: thunderbird
     evolution: evolution
+    sshfs: sshfs
   when: ansible_distribution == "Ubuntu"
 
 
 # TODO Needs tested
 - name: Set FreeBSD Package Names
   ansible.builtin.set_fact:
-    firefox: firefox
+    firefox: firefox-esr
     thunderbird: thunderbird
     evolution: evolution
+    sshfs: fusefs-sshfs
   when: ansible_distribution == "FreeBSD"
\ No newline at end of file
diff --git a/tasks/packages.yml b/tasks/packages.yml
index c7303d4..d3267a7 100644
--- a/tasks/packages.yml
+++ b/tasks/packages.yml
@@ -3,5 +3,5 @@
     name:
     - htop
     - neofetch
-    - sshfs
+    - "{{ sshfs }}"
     update_cache: yes
diff --git a/tasks/users.yml b/tasks/users.yml
index f718431..88acf3b 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -14,7 +14,7 @@
 - name: Add Ansible Sudoers File
   copy:
     src: sudoers_ansible
-    dest: ""{{ sudoers_install_dir }}"/sudoers.d/ansible
+    dest: "{{ sudoers_install_dir }}"
     owner: root
     group: root
     mode: 0440