diff --git a/tasks/general/software/packages.yml b/tasks/general/software/packages.yml
index a4affc3..4920c63 100644
--- a/tasks/general/software/packages.yml
+++ b/tasks/general/software/packages.yml
@@ -144,7 +144,7 @@
 
 # Ubuntu still uses snap for critical components like GNOME, must keep.
 - name: General | Software | Packages | Disable Snap Daemon
-  service:
+  ansible.builtin.service:
     name: snapd
     pattern: snapd
     state: stopped
diff --git a/tasks/general/software/sendmail.yml b/tasks/general/software/sendmail.yml
index 9630170..877b57e 100644
--- a/tasks/general/software/sendmail.yml
+++ b/tasks/general/software/sendmail.yml
@@ -32,7 +32,7 @@
   when: postfix.failed and ansible_system == "FreeBSD"
 
 - name: Server | Sendmail | Enable + Start | Main
-  service:
+  ansible.builtin.service:
     name: "{{ sendmail }}"
     pattern: "{{ sendmail }}"
     state: started
@@ -40,7 +40,7 @@
   when: postfix.failed
 
 - name: Server | Sendmail | Enable + Start | Queue
-  service:
+  ansible.builtin.service:
     name: "{{ sendmail_queue }}"
     pattern: "{{ sendmail_queue }}"
     state: started
diff --git a/tasks/general/software/services.yml b/tasks/general/software/services.yml
index a4f2a62..ce71fb0 100644
--- a/tasks/general/software/services.yml
+++ b/tasks/general/software/services.yml
@@ -4,7 +4,7 @@
 ## Cron ##
 
 - name: General | Software | Services | CROND | Enable
-  service:
+  ansible.builtin.service:
     name: "{{ crond }}"
     pattern: "{{ crond_pattern }}"
     state: started
@@ -17,7 +17,7 @@
   delay: 3
 
 - name: General | Software | Services | CROND | Enable (runit)
-  service:
+  ansible.builtin.service:
     name: "{{ crond }}"
     state: started
     enabled: true
@@ -66,7 +66,7 @@
   when: "'pve' in ansible_kernel"
 
 - name: General | Software | Services | SSHD | Enable
-  service:
+  ansible.builtin.service:
     name: "{{ sshd }}"
     pattern: "{{ sshd_pattern }}"
     state: reloaded
@@ -91,7 +91,7 @@
 # Hehe, I use it now for a few rare things so disabling this for now.
 
 #- name: General | Software | Services | Bluetooth | Disable
-#  service:
+#  ansible.builtin.service:
 #    name: "{{ bluetooth }}"
 #    pattern: "{{ bluetooth_pattern }}"
 #    state: stopped
@@ -101,7 +101,7 @@
 ## NTP ##
 
 - name: General | Software | Services | NTP | Enable
-  service:
+  ansible.builtin.service:
     name: "{{ ntp_server }}"
     pattern: "{{ ntp_server }}"
     state: started
@@ -123,7 +123,7 @@
 ## Disable ##
 
 - name: General | Software | Services | Disable
-  service:
+  ansible.builtin.service:
     name: "{{ item.name }}"
     pattern: "{{ item.pattern }}"
     state: stopped
diff --git a/tasks/server/software/onlyoffice.yml b/tasks/server/software/onlyoffice.yml
index 7a4222d..37f72b5 100644
--- a/tasks/server/software/onlyoffice.yml
+++ b/tasks/server/software/onlyoffice.yml
@@ -93,7 +93,7 @@
 # Services #
 
 - name: Server | OnlyOffice | HTTPS | Reload nginx
-  service:
+  ansible.builtin.service:
     name: nginx
     status: reloaded
   ignore_errors: true
diff --git a/tasks/server/software/services.yml b/tasks/server/software/services.yml
index 22e9d83..a285f09 100644
--- a/tasks/server/software/services.yml
+++ b/tasks/server/software/services.yml
@@ -11,7 +11,7 @@
   ignore_errors: true
 
 - name: Server | Software | Services | ACPID | Enable
-  service:
+  ansible.builtin.service:
     name: "{{ acpi }}"
     pattern: "{{ acpi_pattern }}"
     state: started
diff --git a/tasks/workstation/linux/software/tlp.yml b/tasks/workstation/linux/software/tlp.yml
index 8415c0c..a6b2358 100644
--- a/tasks/workstation/linux/software/tlp.yml
+++ b/tasks/workstation/linux/software/tlp.yml
@@ -28,7 +28,7 @@
 ## Conflicts ##
 
 #- name: Workstation | Linux | Software | TLP | Conflicts | Disable
-#  service:
+#  ansible.builtin.service:
 #    name: "{{ item }}"
 #    state: stopped
 #    enabled: false
@@ -100,7 +100,7 @@
 # Ensure the service is running and will run after reboot.
 
 - name: Workstation | Linux | Software | TLP | Enable + Start
-  service:
+  ansible.builtin.service:
     name: "{{ tlp_service }}"
     state: started
     enabled: true
diff --git a/tasks/workstation/shared/settings/services.yml b/tasks/workstation/shared/settings/services.yml
index 14533bf..dc79777 100644
--- a/tasks/workstation/shared/settings/services.yml
+++ b/tasks/workstation/shared/settings/services.yml
@@ -4,7 +4,7 @@
 ## CUPS ##
 
 - name: General | Software | Services | Enable CUPS Daemon
-  service:
+  ansible.builtin.service:
     name: "{{ cups }}"
     pattern: "{{ cups_pattern }}"
     state: started
@@ -12,7 +12,7 @@
   ignore_errors: true
 
 - name: General | Software | Services | Enable CUPS-Browse Daemon
-  service:
+  ansible.builtin.service:
     name: "{{ cups_browse }}"
     pattern: "{{ cups_browse_pattern }}"
     state: started