diff --git a/tasks/general/tests/services.yml b/tasks/general/tests/services.yml
index 7937615..de6dca3 100644
--- a/tasks/general/tests/services.yml
+++ b/tasks/general/tests/services.yml
@@ -5,7 +5,17 @@
   set_fact:
     services_report_file: "{{ user_user.home }}/Reports/{{ ansible_hostname }}.services.txt"
     services_enabled_file: "{{ user_user.home }}/Reports/{{ ansible_hostname }}.services-enabled.txt"
+    services_command: "echo 'Service Manager {{ ansisible_service_mgr }} Not Recognized'
+
+- name: General | Tests | Services | Set Facts | SystemD
+  set_fact:
     services_command: "systemctl list-unit-files"
+  when: ansisible_service_mgr == "systemd"
+
+- name: General | Tests | Services | Set Facts | runit
+  set_fact:
+    services_command: 'for s in /var/service/*; do sv status "$s"; done'
+  when: ansisible_service_mgr == "runit"
 
 - name: General | Tests | Services | Create Main Report
   shell: "{{ item }}"