diff --git a/facts/general/package.yml b/facts/general/package.yml
index 9f770a8..9524fa4 100644
--- a/facts/general/package.yml
+++ b/facts/general/package.yml
@@ -14,29 +14,6 @@
     lightdm: lightdm
     sddm: sddm
     tmux: tmux
-    base_devel: htop # Placeholder for Arch package.
-    macbook_wifi_driver: broadcom-sta-dkms
-    xz: xz
-    mesa: mesa
-    mesa_utils: mesa-utils
-    ninja: ninja
-    notify_send: libnotify
-    fyi: fyi
-    gtk3: gtk3
-    xz_libs: xz
-    cpp: libstdc++
-    c_libs: glibc
-    cpp_libs: libstdc++
-    z_libs: zlib
-    bzip: bzip2
-    dunst: dunst
-    android_jdk: openjdk
-    ncurses: ncurses
-    android_fastboot: fastboot
-    android_adb: adb
-    android_sdkmanager: sdkmanager
-    android_udev: android-udev
-    gnome_boxes: gnome-boxes
 
 - name: General | Facts | Package | Parrot OS Fixes
   set_fact:
@@ -54,21 +31,6 @@
     encfs: encfs
     dig: dnsutils
     neofetch: fastfetch
-    xz: xz-utils
-    mesa: libglu1-mesa
-    mesa_utils: libglu1-mesa
-    ninja: ninja-build
-    notify_send: libnotify-bin
-    gtk3: libgtk-3-dev
-    xz_libs: liblzma-dev
-    cpp: libstdc++-12-dev
-    c_libs: libc6:amd64
-    cpp_libs: libstdc++6
-    z_libs: lib32z1
-    bzip: libbz2-1.0
-    android_jdk: default-jdk
-    ncurses: libncurses5
-    android_udev: android-udev-rules
   when: ansible_pkg_mgr == "apt"
 
 - name: General | Facts | Package | pacman
@@ -80,11 +42,6 @@
     cron: cronie
     encfs: encfs
     dig: bind
-    base_devel: base-devel
-    macbook_wifi_driver: broadcom-wl-dkms
-    android_jdk: jdk-openjdk
-    android_fastboot: android-tools
-    android_adb: android-tools
   when: ansible_pkg_mgr == "pacman"
 
 - name: General | Facts | Package | FreeBSD
diff --git a/facts/workstation/package.yml b/facts/workstation/package.yml
index 30ec3dc..be276fa 100644
--- a/facts/workstation/package.yml
+++ b/facts/workstation/package.yml
@@ -27,15 +27,56 @@
     sassc: sassc
     ffmpeg: ffmpeg
     wireless_tools: wireless-tools
+    base_devel: htop # Placeholder for Arch package.
+    macbook_wifi_driver: broadcom-sta-dkms
+    xz: xz
+    mesa: mesa
+    mesa_utils: mesa-utils
+    ninja: ninja
+    notify_send: libnotify
+    fyi: fyi
+    gtk3: gtk3
+    xz_libs: xz
+    cpp: libstdc++
+    c_libs: glibc
+    cpp_libs: libstdc++
+    z_libs: zlib
+    bzip: bzip2
+    dunst: dunst
+    android_jdk: openjdk
+    ncurses: ncurses
+    android_fastboot: fastboot
+    android_adb: adb
+    android_sdkmanager: sdkmanager
+    android_udev: android-udev
+    gnome_boxes: gnome-boxes
 
 
+- name: Workstation | Facts | Package | apt
+  set_fact:
+    xz: xz-utils
+    mesa: libglu1-mesa
+    mesa_utils: libglu1-mesa
+    ninja: ninja-build
+    notify_send: libnotify-bin
+    gtk3: libgtk-3-dev
+    xz_libs: liblzma-dev
+    cpp: libstdc++-12-dev
+    c_libs: libc6:amd64
+    cpp_libs: libstdc++6
+    z_libs: lib32z1
+    bzip: libbz2-1.0
+    android_jdk: default-jdk
+    ncurses: libncurses5
+    android_udev: android-udev-rules
+  when: ansible_pkg_mgr == "apt"
+
 - name: Workstation | Facts | Package | Pop_OS!
   set_fact:
     flatpak_distro: true
     firefox_esr: firefox
   when: ansible_distribution == "Pop!_OS"
 
-
 - name: Workstation | Facts | Package | Ubuntu
   set_fact:
     flatpak_distro: true
@@ -43,28 +84,34 @@
     dmenu: suckless-tools
   when: ansible_distribution == "Ubuntu"
 
-
 - name: Workstation | Facts | Package | Debian & Devuan
   set_fact:
     flatpak_distro: true
     dmenu: suckless-tools
+    firefox: firefox-esr
   when: ansible_distribution in ("Debian", "Devuan")
 
-
 - name: Workstation | Facts | Package | Mint
   set_fact:
     flatpak_distro: true
     firefox_esr: firefox
   when: ansible_distribution == "Linux Mint"
 
-
 - name: Workstation | Facts | Package | Parrot OS
   set_fact:
     flatpak_distro: true
-    firefox_esr: firefox-esr
   when: ansible_distribution == "Parrot OS"
 
 
+- name: Workstation | Facts | Package | pacman
+  set_fact:
+    base_devel: base-devel
+    macbook_wifi_driver: broadcom-wl-dkms
+    android_jdk: jdk-openjdk
+    android_fastboot: android-tools
+    android_adb: android-tools
+  when: ansible_pkg_mgr == "apt"
+
 - name: Workstation | Facts | Package | Arch / Manjaro / Artix
   set_fact:
     flatpak_distro: true