diff --git a/tasks/workstation/linux/software/tlp.yml b/tasks/workstation/linux/software/tlp.yml
index 1741fa2..12a1988 100644
--- a/tasks/workstation/linux/software/tlp.yml
+++ b/tasks/workstation/linux/software/tlp.yml
@@ -7,11 +7,12 @@
 
 - name: Workstation | Linux | Software | TLP | Facts
   set_fact:
-    tlp: "tlp"
+    tlp_package: "tlp"
     tlp_rdw: "tlp-rdw"
     tlp_smart: "smartmontools"
     tlp_config: "/etc/tlp.conf"
     tlp_service: "tlp"
+    tlp_run_script: "tlp"
     ppd_package: "power-profiles-daemon"
     ppd_service: "power-profiles-daemon"
     acf_package: "auto-cpufreq"
@@ -20,7 +21,7 @@
 - name: Workstation | Linux | Software | TLP | Facts (Artix)
   set_fact:
     ppd_package: "power-profiles-daemon power-profiles-daemon-runit"
-    tlp: tlp tlp-runit
+    tlp_run_script: tlp-runit
   when: ansible_pkg_mgr == "pacman"
     and ansible_service_mgr == "runit"
 
@@ -48,22 +49,12 @@
 - name: Workstation | Linux | Software | TLP | Install
   package:
     name:
-      - "{{ tlp }}"
+      - "{{ tlp_package }}"
       - "{{ tlp_rdw }}"
       - "{{ tlp_smart }}"
+      - "{{ tlp_run_script }}"
     update_cache: yes
 
-- name: Workstation | Linux | Software | TLP | Enable
-  service:
-    name: tlp
-    state: started
-    enabled: yes
-  when: ansible_service_mgr not in ("runit")
-
-- name: Workstation | Linux | Software | TLP | Enable (runit, Artix)
-  shell: "ln -s {{runit_script_dir }}/tlp {{ runit_service_dir }}/tlp"
-  when: ansible_service_mgr == "runit"
-
 ## Configuration ##
 
 # Device choices:
@@ -104,4 +95,9 @@
     name: "{{ tlp_service }}"
     state: started
     enabled: true
-  when: ansible_service_mgr != "runit" # TBD: Figure out how to do this on runit.
+  when: ansible_service_mgr not in ("runit")
+
+- name: Workstation | Linux | Software | TLP | Enable + Start (runit)
+  shell: "ln -s {{runit_script_dir }}/tlp {{ runit_service_dir }}/tlp"
+  when: ansible_service_mgr == "runit"
+