From e3bdcc595a1a45f793fc957af51afaa733ff6df5 Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Fri, 2 Oct 2026 11:26:21 -0700
Subject: [PATCH] Migrate `package` to FQCN.

---
 tasks/general/software/metasploit.yml         |  2 +-
 tasks/general/software/packages.yml           | 24 +++++++++----------
 tasks/general/software/sendmail.yml           |  2 +-
 tasks/general/software/telegraf.yml           |  4 ++--
 tasks/miner/drivers/amdgpu.yml                |  4 ++--
 tasks/miner/software/ethminer.yml             |  4 ++--
 tasks/server/software/grafana.yml             |  4 ++--
 tasks/server/software/hugo.yml                |  2 +-
 tasks/server/software/onlyoffice.yml          |  8 +++----
 tasks/server/software/services.yml            |  2 +-
 tasks/workstation/freebsd/software/gnome.yml  |  2 +-
 tasks/workstation/freebsd/software/gpu.yml    |  2 +-
 .../workstation/freebsd/software/packages.yml | 16 ++++++-------
 tasks/workstation/linux/software/android.yml  |  8 +++----
 tasks/workstation/linux/software/brave.yml    |  8 +++----
 tasks/workstation/linux/software/cinnamon.yml |  2 +-
 tasks/workstation/linux/software/flatpaks.yml |  2 +-
 tasks/workstation/linux/software/flutter.yml  |  6 ++---
 tasks/workstation/linux/software/gnome.yml    |  2 +-
 tasks/workstation/linux/software/hugo.yml     |  4 ++--
 tasks/workstation/linux/software/java.yml     |  2 +-
 tasks/workstation/linux/software/lutris.yml   |  4 ++--
 tasks/workstation/linux/software/lxqt.yml     |  2 +-
 tasks/workstation/linux/software/nodejs.yml   |  8 +++----
 tasks/workstation/linux/software/packages.yml | 16 ++++++-------
 tasks/workstation/linux/software/tlp.yml      |  4 ++--
 tasks/workstation/linux/software/vpn.yml      |  4 ++--
 tasks/workstation/linux/software/vscodium.yml |  4 ++--
 tasks/workstation/mac-os/software/brew.yml    | 14 +++++------
 .../workstation/shared/settings/cinnamon.yml  |  2 +-
 tasks/workstation/shared/settings/gnome.yml   |  4 ++--
 tasks/workstation/shared/settings/nfs.yml     |  2 +-
 tasks/workstation/shared/settings/rdp.yml     |  2 +-
 tasks/workstation/shared/software/dwm.yml     |  2 +-
 tasks/workstation/shared/software/i3.yml      |  2 +-
 35 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/tasks/general/software/metasploit.yml b/tasks/general/software/metasploit.yml
index 6f18f00..3e151f6 100644
--- a/tasks/general/software/metasploit.yml
+++ b/tasks/general/software/metasploit.yml
@@ -45,7 +45,7 @@
     and pentesting == false
 
 - name: General | Software | Metasploit | Remove
-  package:
+  ansible.builtin.package:
     name: "metasploit-framework"
     state: absent
   when: ansible_system in ("Linux")
diff --git a/tasks/general/software/packages.yml b/tasks/general/software/packages.yml
index 04bc546..0c58f2e 100644
--- a/tasks/general/software/packages.yml
+++ b/tasks/general/software/packages.yml
@@ -28,7 +28,7 @@
 
 
 - name: General | Software | Packages | Cache Refresh (Apt and Pacman)
-  package:
+  ansible.builtin.package:
     update_cache: true
     name: htop
   when: ansible_pkg_mgr in ["apt", "pacman"]
@@ -38,7 +38,7 @@
   when: ansible_system == "FreeBSD"
 
 - name: General | Software | Packages | Install Software
-  package:
+  ansible.builtin.package:
     name:
       - bash
       - sudo
@@ -71,7 +71,7 @@
     state: present
 
 - name: General | Software | Packages | Install Software (DEV)
-  package:
+  ansible.builtin.package:
     name:
       - "{{ microcode_amd }}"
       - "{{ microcode_intel }}"
@@ -80,7 +80,7 @@
   ignore_errors: true
 
 - name: General | Software | Packages | Add Generic Kernel + Tools (Ubuntu)
-  package:
+  ansible.builtin.package:
     name:
       - linux-image-generic
       - linux-headers-generic
@@ -91,7 +91,7 @@
   ignore_errors: true
 
 - name: General | Software | Packages | Add Generic Kernel + Headers (Debian)
-  package:
+  ansible.builtin.package:
     name:
       - linux-image-amd64
       - linux-headers-amd64
@@ -100,13 +100,13 @@
   ignore_errors: true
 
 - name: General | Software | Packages | Install killall (Looking at you, Debian)
-  package:
+  ansible.builtin.package:
     name: psmisc
     state: present
   when: ansible_distribution == "Debian"
 
 - name: General | Software | Packages | Install "Bloat" (Looking at you, Arch Base)
-  package:
+  ansible.builtin.package:
     name:
       - which
       - "{{ cron }}"
@@ -115,7 +115,7 @@
   when: ansible_pkg_mgr == "pacman"
 
 - name: General | Software | Packages | Install Fix (Looking at you, openSUSE)
-  package:
+  ansible.builtin.package:
     name:
       # openSUSE Tumbleweed comes without gnome-control-center being able to open
       #  properly. Hopefully just a one-time accident but I wanted bleeding edge so I
@@ -127,7 +127,7 @@
   when: ansible_pkg_mgr in ("zypper")
 
 - name: General | Software | Packages | Update Software (Disabled)
-  package:
+  ansible.builtin.package:
     name:
       - ansible
       - git
@@ -135,7 +135,7 @@
   when: 1 == 0
 
 - name: General | Software | Packages | Remove Software
-  package:
+  ansible.builtin.package:
     name:
       - cowsay # Sorry ;)
       - chromium
@@ -153,7 +153,7 @@
   ignore_errors: true
 
 - name: General | Software | Packages | Remove Snap (Besides Ubuntu)
-  package:
+  ansible.builtin.package:
     name:
       - snapd
     state: absent
@@ -161,7 +161,7 @@
   ignore_errors: true
 
 - name: General | Software | Packages | Other Debian Packages
-  package:
+  ansible.builtin.package:
     name:
       - usbutils
     state: present
diff --git a/tasks/general/software/sendmail.yml b/tasks/general/software/sendmail.yml
index 4828290..19f1965 100644
--- a/tasks/general/software/sendmail.yml
+++ b/tasks/general/software/sendmail.yml
@@ -13,7 +13,7 @@
   ignore_errors: true
 
 - name: Server | Sendmail | Install
-  package:
+  ansible.builtin.package:
     name:
       - "{{ sendmail }}"
     state: present
diff --git a/tasks/general/software/telegraf.yml b/tasks/general/software/telegraf.yml
index 6aa3827..17e7959 100644
--- a/tasks/general/software/telegraf.yml
+++ b/tasks/general/software/telegraf.yml
@@ -40,7 +40,7 @@
 #### Dependencies #
 ###
 ###- name: General | Telegraf | Pre-Reqs
-###  package:
+###  ansible.builtin.package:
 ###    name: wget
 ###  when: ansible_system == "Linux"
 ###
@@ -65,7 +65,7 @@
 ###  when: ansible_system == "FreeBSD"
 ###
 ###- name: General | Telegraf | FreeBSD | Install 2/2
-###  package:
+###  ansible.builtin.package:
 ###    name: telegraf
 ###  when: ansible_system == "FreeBSD"
 ###
diff --git a/tasks/miner/drivers/amdgpu.yml b/tasks/miner/drivers/amdgpu.yml
index 8e12b59..57a7ef5 100644
--- a/tasks/miner/drivers/amdgpu.yml
+++ b/tasks/miner/drivers/amdgpu.yml
@@ -8,7 +8,7 @@
     amdgpu_cron_cmd: "{{ root_home.stdout }}/scm.sh"
 
 - name: Miner | Driver | AMDGPU | Install Dependencies
-  package:
+  ansible.builtin.package:
     name:
       - dkms
       - mesa-common-dev
@@ -66,7 +66,7 @@
   when: amdgpu_install.failed and hwe_kernel.stdout != "0" and ga_kernel.failed
 
 - name: Miner | Driver | AMDGPU | Install Specific GA Kernel For Booting
-  package:
+  ansible.builtin.package:
     name:
       - linux-headers-5.4.0-65
       - linux-headers-5.4.0-65-generic
diff --git a/tasks/miner/software/ethminer.yml b/tasks/miner/software/ethminer.yml
index 62c5fe5..684147e 100644
--- a/tasks/miner/software/ethminer.yml
+++ b/tasks/miner/software/ethminer.yml
@@ -3,7 +3,7 @@
 
 ## Dependencies ##
 - name: Miner | Software | Ethminer | Install Dependencies
-  package:
+  ansible.builtin.package:
     name:
       - build-essential
       - dkms
@@ -20,7 +20,7 @@
     state: present
 
 - name: Miner | Software | Ethminer | Install Ethereum
-  package:
+  ansible.builtin.package:
     name: ethereum
     state: present
 
diff --git a/tasks/server/software/grafana.yml b/tasks/server/software/grafana.yml
index 9eb2043..f65d7a2 100644
--- a/tasks/server/software/grafana.yml
+++ b/tasks/server/software/grafana.yml
@@ -5,7 +5,7 @@
 ## Pre-reqs ##
 
 - name: Server | Grafana | Pre-Requirements | Install
-  package:
+  ansible.builtin.package:
     name:
       - apt-transport-https
       - software-properties-common
@@ -23,7 +23,7 @@
     - apt update
 
 - name: Server | Grafana | Install | Main
-  package:
+  ansible.builtin.package:
     name:
       - grafana
     state: present
diff --git a/tasks/server/software/hugo.yml b/tasks/server/software/hugo.yml
index 1f7b669..a8ba92d 100644
--- a/tasks/server/software/hugo.yml
+++ b/tasks/server/software/hugo.yml
@@ -13,6 +13,6 @@
 
 
 - name: Server | Software | HUGO | Variables (FreeBSD)
-  package:
+  ansible.builtin.package:
     name: "{{ hugo_package }}"
     state: present
diff --git a/tasks/server/software/onlyoffice.yml b/tasks/server/software/onlyoffice.yml
index 37f72b5..393764f 100644
--- a/tasks/server/software/onlyoffice.yml
+++ b/tasks/server/software/onlyoffice.yml
@@ -4,7 +4,7 @@
 ## Pre-Reqs ##
 
 - name: Server | OnlyOffice | Pre-Requirements | Install
-  package:
+  ansible.builtin.package:
     name:
       - gnupg
       - python3-certbot-nginx
@@ -17,7 +17,7 @@
 # Dependencies #
 
 - name: Server | OnlyOffice | Postgres | Install
-  package:
+  ansible.builtin.package:
     name: postgresql
     state: present
 
@@ -32,7 +32,7 @@
   ignore_errors: true
 
 - name: Server | OnlyOffice | RabbitMQ | Install
-  package:
+  ansible.builtin.package:
     name: rabbitmq-server
     state: present
 
@@ -46,7 +46,7 @@
     - apt update
 
 - name: Server | OnlyOffice | Docs | Install
-  package:
+  ansible.builtin.package:
     name:
       - ttf-mscorefonts-installer
       - onlyoffice-documentserver
diff --git a/tasks/server/software/services.yml b/tasks/server/software/services.yml
index a285f09..52d42c4 100644
--- a/tasks/server/software/services.yml
+++ b/tasks/server/software/services.yml
@@ -4,7 +4,7 @@
 ## ACPID ##
 
 - name: Server | Software | Services | ACPID | Install
-  package:
+  ansible.builtin.package:
     name: "{{ acpi }}"
     state: present
   when: ansible_system == "Linux"
diff --git a/tasks/workstation/freebsd/software/gnome.yml b/tasks/workstation/freebsd/software/gnome.yml
index a1b239d..f3ba20a 100644
--- a/tasks/workstation/freebsd/software/gnome.yml
+++ b/tasks/workstation/freebsd/software/gnome.yml
@@ -2,7 +2,7 @@
 # Provide FreeBSD with a DE.
 
 - name: Workstation | FreeBSD | Software | GUI | Install UI Components
-  package:
+  ansible.builtin.package:
     name:
     - xorg
     - gnome3-lite
diff --git a/tasks/workstation/freebsd/software/gpu.yml b/tasks/workstation/freebsd/software/gpu.yml
index 373245c..06f9ead 100644
--- a/tasks/workstation/freebsd/software/gpu.yml
+++ b/tasks/workstation/freebsd/software/gpu.yml
@@ -2,7 +2,7 @@
 # Provide FreeBSD with GPU driver.
 
 - name: Workstation | FreeBSD | Software | GPU Driver | Install
-  package:
+  ansible.builtin.package:
     name:
     - drm-kmod
     state: present
diff --git a/tasks/workstation/freebsd/software/packages.yml b/tasks/workstation/freebsd/software/packages.yml
index 989b7bb..03b851b 100644
--- a/tasks/workstation/freebsd/software/packages.yml
+++ b/tasks/workstation/freebsd/software/packages.yml
@@ -4,7 +4,7 @@
 # General #
 
 - name: Workstation | FreeBSD | Software | Packages | General | Install
-  package:
+  ansible.builtin.package:
     name:
     - "{{ firefox_esr }}"
     - "{{ evolution }}"
@@ -13,7 +13,7 @@
     state: present
 
 - name: Workstation | FreeBSD | Software | Packages | General | Uninstall Bloat
-  package:
+  ansible.builtin.package:
     name:
     - "{{ firefox }}"
     - "{{ thunderbird }}"
@@ -22,14 +22,14 @@
 # Coding #
 
 - name: Workstation | FreeBSD | Software | Packages | Coding | Install
-  package:
+  ansible.builtin.package:
     name:
     - vscode
     state: present
   when: coding
 
 - name: Workstation | FreeBSD | Software | Packages | Coding | Install
-  package:
+  ansible.builtin.package:
     name:
     - vscode
     state: absent
@@ -38,7 +38,7 @@
 # Media Editors #
 
 - name: Workstation | FreeBSD | Software | Packages | Editing | Install
-  package:
+  ansible.builtin.package:
     name:
     - gimp
     - shotcut
@@ -47,7 +47,7 @@
   when: editing in (true, "video")
 
 - name: Workstation | FreeBSD | Software | Packages | Editing | Install
-  package:
+  ansible.builtin.package:
     name:
     - gimp
     - shotcut
@@ -58,7 +58,7 @@
 # Gaming #
 
 - name: Workstation | FreeBSD | Software | Packages | Gaming | Install
-  package:
+  ansible.builtin.package:
     name:
     - 0ad
     - supertuxkart
@@ -66,7 +66,7 @@
   when: gaming
 
 - name: Workstation | FreeBSD | Software | Packages | Gaming | Install
-  package:
+  ansible.builtin.package:
     name:
     - 0ad
     - supertuxkart
diff --git a/tasks/workstation/linux/software/android.yml b/tasks/workstation/linux/software/android.yml
index 77b4869..a76e1f0 100644
--- a/tasks/workstation/linux/software/android.yml
+++ b/tasks/workstation/linux/software/android.yml
@@ -180,7 +180,7 @@
 
 # https://docs.flutter.dev/get-started/install/linux/android
 - name: Workstation | Linux | Software | Android | Dependencies [Install]
-  package:
+  ansible.builtin.package:
     name:
       - "{{ android_jdk }}"
       - "{{ c_libs }}"
@@ -193,7 +193,7 @@
   when: coding
 
 - name: Workstation | Linux | Software | Android | Dependencies [Remove]
-  package:
+  ansible.builtin.package:
     name:
       - "{{ android_sdkmanager }}"
     state: absent
@@ -423,7 +423,7 @@
 #   otherwise better versions are in the SDK.
 
 - name: Workstation | Linux | Software | Android | System Tools [Install]
-  package:
+  ansible.builtin.package:
     name:
       - "{{ android_fastboot }}"
       - "{{ android_adb }}"
@@ -431,7 +431,7 @@
   when: not coding
 
 - name: Workstation | Linux | Software | Android | System Tools [Remove]
-  package:
+  ansible.builtin.package:
     name:
       - "{{ android_fastboot }}"
       - "{{ android_adb }}"
diff --git a/tasks/workstation/linux/software/brave.yml b/tasks/workstation/linux/software/brave.yml
index 967f969..f78c67f 100644
--- a/tasks/workstation/linux/software/brave.yml
+++ b/tasks/workstation/linux/software/brave.yml
@@ -5,14 +5,14 @@
 # to Firefox months/years back for avoiding DRM and other junk Google stuff.
 ###
 ###- name: Workstation | Software | Brave | Pre-Reqs [apt]
-###  package:
+###  ansible.builtin.package:
 ###    name:
 ###      - apt-transport-https
 ###    state: present
 ###  when: ansible_pkg_mgr == "apt"
 ###
 ###- name: Workstation | Software | Brave | Pre-Reqs [dnf]
-###  package:
+###  ansible.builtin.package:
 ###    name:
 ###      - dnf-plugins-core
 ###    state: present
@@ -45,7 +45,7 @@
 ###  ignore_errors: true
 ###
 ###- name: Workstation | Software | Brave | Install
-###  package:
+###  ansible.builtin.package:
 ###    name:
 ###      - brave-browser
 ###    state: present
@@ -55,7 +55,7 @@
 # https://support.brave.com/hc/en-us/articles/4404876135565-How-do-I-uninstall-Brave
 
 - name: Workstation | Software | Brave | Remove
-  package:
+  ansible.builtin.package:
     name:
       - brave-browser
       - brave-keyring
diff --git a/tasks/workstation/linux/software/cinnamon.yml b/tasks/workstation/linux/software/cinnamon.yml
index c306224..c6cdf8a 100644
--- a/tasks/workstation/linux/software/cinnamon.yml
+++ b/tasks/workstation/linux/software/cinnamon.yml
@@ -16,7 +16,7 @@
   when: ansible_distribution in ("Debian", "Devuan")
 
 - name: Workstation | Linux | Software | Cinnamon | Install
-  package:
+  ansible.builtin.package:
     name:
       - "{{ cinnamon_package }}"
       - "{{ lightdm }}"
diff --git a/tasks/workstation/linux/software/flatpaks.yml b/tasks/workstation/linux/software/flatpaks.yml
index 51bc982..792a16a 100644
--- a/tasks/workstation/linux/software/flatpaks.yml
+++ b/tasks/workstation/linux/software/flatpaks.yml
@@ -17,7 +17,7 @@
 ## Flatpak Pre-reqs ##
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Install
-  package:
+  ansible.builtin.package:
     name: flatpak
     update_cache: true
 
diff --git a/tasks/workstation/linux/software/flutter.yml b/tasks/workstation/linux/software/flutter.yml
index 4b07335..1354b8e 100644
--- a/tasks/workstation/linux/software/flutter.yml
+++ b/tasks/workstation/linux/software/flutter.yml
@@ -48,7 +48,7 @@
 ## Packages ##
 
 - name: Workstation | Linux | Software | Flutter | Necessities
-  package:
+  ansible.builtin.package:
     name:
     - curl
     - git
@@ -62,7 +62,7 @@
 
 # https://docs.flutter.dev/get-started/install/linux/desktop
 - name: Workstation | Linux | Software | Flutter | Linux App Dependencies
-  package:
+  ansible.builtin.package:
     name:
     - clang
     - cmake
@@ -77,7 +77,7 @@
 
 # https://docs.flutter.dev/get-started/install/linux/android
 - name: Workstation | Linux | Software | Flutter | Android App Dependencies
-  package:
+  ansible.builtin.package:
     name:
       - "{{ c_libs }}"
       - "{{ cpp_libs }}"
diff --git a/tasks/workstation/linux/software/gnome.yml b/tasks/workstation/linux/software/gnome.yml
index 1658b0b..0734a8c 100644
--- a/tasks/workstation/linux/software/gnome.yml
+++ b/tasks/workstation/linux/software/gnome.yml
@@ -7,7 +7,7 @@
   ignore_errors: true
 
 - name: Workstation | Linux | Software | GNOME | Install
-  package:
+  ansible.builtin.package:
     name:
       - gnome
       - gdm3
diff --git a/tasks/workstation/linux/software/hugo.yml b/tasks/workstation/linux/software/hugo.yml
index 7b8c530..5b843af 100644
--- a/tasks/workstation/linux/software/hugo.yml
+++ b/tasks/workstation/linux/software/hugo.yml
@@ -14,13 +14,13 @@
         sass_current: dart-sass
 
     - name: Workstation | Linux | Software | Hugo | pacman | Remove Old
-      package:
+      ansible.builtin.package:
         name:
           - "{{ sass_old }}"
         state: absent
 
     - name: Workstation | Linux | Software | Hugo | pacman | Install New
-      package:
+      ansible.builtin.package:
         name:
           - "{{ sass_current }}"
         state: present
diff --git a/tasks/workstation/linux/software/java.yml b/tasks/workstation/linux/software/java.yml
index b7d558b..3819cce 100644
--- a/tasks/workstation/linux/software/java.yml
+++ b/tasks/workstation/linux/software/java.yml
@@ -11,7 +11,7 @@
       jdk_dir: ~/SDKs/Java
 
   - name: Workstation | Linux | Software | Java | pacman | Install
-    package:
+    ansible.builtin.package:
       name:
         - "jdk{{ item }}-openjdk"
       state: present
diff --git a/tasks/workstation/linux/software/lutris.yml b/tasks/workstation/linux/software/lutris.yml
index ac50e36..cd6ef4d 100644
--- a/tasks/workstation/linux/software/lutris.yml
+++ b/tasks/workstation/linux/software/lutris.yml
@@ -56,7 +56,7 @@
 ## Install Package ##
 
 - name: Workstation | Linux | Software | Lutris | Install (besides ARM)
-  package:
+  ansible.builtin.package:
     name:
       - lutris
     state: present
@@ -65,7 +65,7 @@
 ## Uninstall Package ##
 
 - name: Workstation | Linux | Software | Lutris | Uninstall (besides ARM)
-  package:
+  ansible.builtin.package:
     name:
       - lutris
     state: absent
diff --git a/tasks/workstation/linux/software/lxqt.yml b/tasks/workstation/linux/software/lxqt.yml
index 9393b00..b26e9bf 100644
--- a/tasks/workstation/linux/software/lxqt.yml
+++ b/tasks/workstation/linux/software/lxqt.yml
@@ -12,7 +12,7 @@
   when: ansible_distribution in ("Debian", "Devuan")
 
 - name: Workstation | Linux | Software | LXQt | Install
-  package:
+  ansible.builtin.package:
     name:
       - "{{ lxqt_package }}"
       - "{{ sddm }}"
diff --git a/tasks/workstation/linux/software/nodejs.yml b/tasks/workstation/linux/software/nodejs.yml
index 1fae1f1..e1f3202 100644
--- a/tasks/workstation/linux/software/nodejs.yml
+++ b/tasks/workstation/linux/software/nodejs.yml
@@ -15,12 +15,12 @@
         node_version: node_24.x
 
     - name: Workstation | Software | NodeJS | apt | Old | Remove
-      package:
+      ansible.builtin.package:
         name: npm
         state: absent
 
     - name: Workstation | Software | NodeJS | apt | extrepo | Install
-      package:
+      ansible.builtin.package:
         name: extrepo
         state: present
         update_cache: true
@@ -29,7 +29,7 @@
       ansible.builtin.shell: "extrepo enable {{ node_version }}"
 
     - name: Workstation | Software | NodeJS | apt | Install
-      package:
+      ansible.builtin.package:
         name: nodejs
         state: latest
         update_cache: true
@@ -37,7 +37,7 @@
     when: ansible_pkg_mgr == "apt"
 
   - name: Workstation | Software | NodeJS | All Others | Install
-    package:
+    ansible.builtin.package:
       name:
         - nodejs
         - npm
diff --git a/tasks/workstation/linux/software/packages.yml b/tasks/workstation/linux/software/packages.yml
index 253ed37..73c1ae7 100644
--- a/tasks/workstation/linux/software/packages.yml
+++ b/tasks/workstation/linux/software/packages.yml
@@ -20,7 +20,7 @@
 ## Packages ##
 
 - name: Workstation | Linux | Software | Packages | Install Software (Editing)
-  package:
+  ansible.builtin.package:
     name:
       - "{{ ffmpeg }}"
     state: present
@@ -32,7 +32,7 @@
 # Software not yet available or working properly in Flatpak form.
 
 - name: Workstation | Linux | Software | Packages | Install From Repo
-  package:
+  ansible.builtin.package:
     name:
       - "{{ vlc }}"
       - "{{ vlc_plugins }}"
@@ -53,7 +53,7 @@
     state: present
 
 - name: Workstation | Linux | Software | Packages | Install From Repo [Coding]
-  package:
+  ansible.builtin.package:
     name:
       - "{{ appimagelauncher }}"
       - hugo
@@ -62,14 +62,14 @@
   when: coding
 
 - name: Workstation | Linux | Software | Packages | Install From Repo [Editing]
-  package:
+  ansible.builtin.package:
     name:
       - gimp
     state: present
   when: editing
 
 - name: Workstation | Linux | Software | Packages | Install Audio (Looking at you, Artix)
-  package:
+  ansible.builtin.package:
     name:
       - pipewire
       - pipewire-pulse
@@ -80,7 +80,7 @@
     and ansible_service_mgr == "runit"
 
 - name: Workstation | Linux | Software | Packages | Extra For Liberated Init Systems
-  package:
+  ansible.builtin.package:
     name:
       - "{{ dunst }}"
     state: present
@@ -107,7 +107,7 @@
   ignore_errors: true
 
 - name: Workstation | Linux | Software | Packages | GS Connect (KDE Connect, Android Tool)
-  package:
+  ansible.builtin.package:
     name:
       - gnome-shell-extension-gsconnect
     state: present
@@ -117,7 +117,7 @@
 # Remove Repo Software #
 
 - name: Workstation | Linux | Software | Packages | Remove Applications
-  package:
+  ansible.builtin.package:
     name:
       - "{{ thunderbird }}"
       - "{{ evolution }}"
diff --git a/tasks/workstation/linux/software/tlp.yml b/tasks/workstation/linux/software/tlp.yml
index 4f4a7e6..3418a48 100644
--- a/tasks/workstation/linux/software/tlp.yml
+++ b/tasks/workstation/linux/software/tlp.yml
@@ -38,7 +38,7 @@
 #  ignore_errors: true
 
 - name: Workstation | Linux | Software | TLP | Conflicts | Remove
-  package:
+  ansible.builtin.package:
     name:
       - "{{ ppd_package }}"
       - "{{ acf_package }}"
@@ -47,7 +47,7 @@
 ## Install TLP + Associated Software ##
 
 - name: Workstation | Linux | Software | TLP | Install
-  package:
+  ansible.builtin.package:
     name:
       - "{{ tlp_package }}"
       - "{{ tlp_rdw }}"
diff --git a/tasks/workstation/linux/software/vpn.yml b/tasks/workstation/linux/software/vpn.yml
index 8ec7a15..c59af43 100644
--- a/tasks/workstation/linux/software/vpn.yml
+++ b/tasks/workstation/linux/software/vpn.yml
@@ -21,13 +21,13 @@
     when: ansible_pkg_mgr == "dnf"
 
   - name: Workstation | Software | VPN | Install
-    package:
+    ansible.builtin.package:
       name:
         - mullvad-vpn
       state: present
 
   - name: Workstation | Software | VPN | Install (Artix, runit)
-    package:
+    ansible.builtin.package:
       name:
         - mullvad-vpn-runit
       state: present
diff --git a/tasks/workstation/linux/software/vscodium.yml b/tasks/workstation/linux/software/vscodium.yml
index b8e696b..113ff1a 100644
--- a/tasks/workstation/linux/software/vscodium.yml
+++ b/tasks/workstation/linux/software/vscodium.yml
@@ -46,7 +46,7 @@
   ## Install Package ##
 
   - name: Workstation | Linux | Software | VS Codium | Install
-    package:
+    ansible.builtin.package:
       name:
         - codium
       state: present
@@ -56,7 +56,7 @@
   ## Remove Package ##
 
   - name: Workstation | Linux | Software | VS Codium | Uninstall
-    package:
+    ansible.builtin.package:
       name:
         - codium
       state: absent
diff --git a/tasks/workstation/mac-os/software/brew.yml b/tasks/workstation/mac-os/software/brew.yml
index 29c8cb8..83f1d99 100644
--- a/tasks/workstation/mac-os/software/brew.yml
+++ b/tasks/workstation/mac-os/software/brew.yml
@@ -4,7 +4,7 @@
 # FreeBSD has its own. May be good to keep it separate so it's more to-the-point.
 
 - name: Workstation | Mac OS | Software | Brew | Install Packages
-  package:
+  ansible.builtin.package:
     name:
       - atomic-wallet
       - brave-browser
@@ -14,7 +14,7 @@
     status: present
 
 - name: Workstation | Mac OS | Software | Brew | Install Packages (Coding)
-  package:
+  ansible.builtin.package:
     name:
       - android studio
       - firefox-esr
@@ -23,21 +23,21 @@
   when: coding
 
 - name: Workstation | Mac OS | Software | Brew | Install Packages (Editing:Video)
-  package:
+  ansible.builtin.package:
     name:
       - shotcut
     status: present
   when: editing in (true, "video")
 
 - name: Workstation | Mac OS | Software | Brew | Install Packages (Editing:Audio)
-  package:
+  ansible.builtin.package:
     name:
       - audacity
     status: present
   when: editing in (true, "audio")
 
 - name: Workstation | Mac OS | Software | Brew | Install Packages (Gaming)
-  package:
+  ansible.builtin.package:
     name:
       - battle-net
       - steam
@@ -45,13 +45,13 @@
   when: gaming
 
 - name: Workstation | Mac OS | Software | Brew | Install Packages (Cycling)
-  package:
+  ansible.builtin.package:
     name:
       - zwift
     status: present
   when: cycling
 
 #- name: Workstation | Mac OS | Software | Brew | Remove Packages
-#  package:
+#  ansible.builtin.package:
 #    name:
 #    status: present
diff --git a/tasks/workstation/shared/settings/cinnamon.yml b/tasks/workstation/shared/settings/cinnamon.yml
index 0873cc9..f8756b6 100644
--- a/tasks/workstation/shared/settings/cinnamon.yml
+++ b/tasks/workstation/shared/settings/cinnamon.yml
@@ -59,7 +59,7 @@
 
 # Make sure Gnome-Tweaks is installed
 - name: Workstation | Account Management | Cinnamon | Install Dependencies
-  package:
+  ansible.builtin.package:
     name:
       - "{{ gnome_tweaks }}"
       - "{{ dconf_editor }}"
diff --git a/tasks/workstation/shared/settings/gnome.yml b/tasks/workstation/shared/settings/gnome.yml
index eb2c206..4db22cd 100644
--- a/tasks/workstation/shared/settings/gnome.yml
+++ b/tasks/workstation/shared/settings/gnome.yml
@@ -58,7 +58,7 @@
 
 # Make sure Gnome-Tweaks is installed
 - name: Workstation | Account Management | GNOME | Install Dependencies
-  package:
+  ansible.builtin.package:
     name:
       - "{{ gnome_tweaks }}"
       - "{{ dconf_editor }}"
@@ -92,7 +92,7 @@
     when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed
 
   - name: Workstation | Account Management | GNOME | Dash To Dock | Install | Dependencies
-    package:
+    ansible.builtin.package:
       name:
         - "{{ make }}"
         - "{{ msgfmt }}"
diff --git a/tasks/workstation/shared/settings/nfs.yml b/tasks/workstation/shared/settings/nfs.yml
index 015f28e..027dd85 100644
--- a/tasks/workstation/shared/settings/nfs.yml
+++ b/tasks/workstation/shared/settings/nfs.yml
@@ -13,7 +13,7 @@
 
 
 - name: Workstation | Settings | NFS | Install (Linux)
-  package:
+  ansible.builtin.package:
     name:
       - "{{ nfs }}"
     state: present
diff --git a/tasks/workstation/shared/settings/rdp.yml b/tasks/workstation/shared/settings/rdp.yml
index 86997db..dd48362 100644
--- a/tasks/workstation/shared/settings/rdp.yml
+++ b/tasks/workstation/shared/settings/rdp.yml
@@ -2,7 +2,7 @@
 # Allow remote viewing via open/free RDP.
 
 - name: Workstation | Settings | RDP | FreeBSD | Install
-  package:
+  ansible.builtin.package:
     name: xrdp
     state: present
   when: ansible_system == "FreeBSD"
diff --git a/tasks/workstation/shared/software/dwm.yml b/tasks/workstation/shared/software/dwm.yml
index 90f8c34..72aa00a 100644
--- a/tasks/workstation/shared/software/dwm.yml
+++ b/tasks/workstation/shared/software/dwm.yml
@@ -11,7 +11,7 @@
 ## Pre-reqs ##
 
 - name: Workstation | Linux | Software | DWM | Pre-Reqs
-  package:
+  ansible.builtin.package:
     name:
       - git
       - "{{ make }}"
diff --git a/tasks/workstation/shared/software/i3.yml b/tasks/workstation/shared/software/i3.yml
index 3cca4ca..235d4c7 100644
--- a/tasks/workstation/shared/software/i3.yml
+++ b/tasks/workstation/shared/software/i3.yml
@@ -49,7 +49,7 @@
 #  when: ansible_distribution in ("TBD")
 
 - name: Workstation | Shared | Software | i3 | Install
-  package:
+  ansible.builtin.package:
     name:
       - "{{ i3_package }}"
       - "{{ lightdm }}"