diff --git a/roles/system-info/handlers/main.yaml b/roles/system-info/handlers/main.yaml
new file mode 100644
index 0000000..2ce7594
--- /dev/null
+++ b/roles/system-info/handlers/main.yaml
@@ -0,0 +1,7 @@
+---
+- name: restart system-info
+  systemd:
+    name: system-info
+    scope: user
+    daemon_reload: true
+    state: restarted
diff --git a/roles/system-info/tasks/Debian.yaml b/roles/system-info/tasks/Debian.yaml
index 4570051..fbbda02 100644
--- a/roles/system-info/tasks/Debian.yaml
+++ b/roles/system-info/tasks/Debian.yaml
@@ -12,10 +12,21 @@
     state: directory
     dest: ~/.config/systemd/user
 
+- set_fact:
+    SYSTEM_INFO_SCRIPT_DIR: '{{ansible_env.HOME}}/.config/tmux/system-info'
+
+- when: '"WSL" not in ansible_kernel'
+  set_fact:
+    SYSTEM_INFO_SCRIPT: '{{SYSTEM_INFO_SCRIPT_DIR}}/system-info-Linux.sh'
+- when: '"WSL" in ansible_kernel'
+  set_fact:
+    SYSTEM_INFO_SCRIPT: '{{SYSTEM_INFO_SCRIPT_DIR}}/system-info-WSL.sh'
+
 - name: install system-info systemd unit
-  copy:
-    src: ~/.config/tmux/system-info/system-info.service
+  template:
+    src: templates/system-info.service.j2
     dest: ~/.config/systemd/user/system-info.service
+  notify: restart system-info
 
 - name: enable system-info service
   systemd:
diff --git a/roles/system-info/tasks/Windows.yaml b/roles/system-info/tasks/Windows.yaml
index cfe121d..3c36d78 100644
--- a/roles/system-info/tasks/Windows.yaml
+++ b/roles/system-info/tasks/Windows.yaml
@@ -30,29 +30,29 @@
     start_when_available: true
     wake_to_run: false
 
-- name: create system-info-WSL.sh scheduled task
-  win_scheduled_task:
-    path: Benie
-    name: system-info-WSL.sh
-    state: present
-    enable: true
-    triggers:
-      - type: logon
-        enabled: true
-      - type: registration
-        enabled: true
-    actions:
-      - path: '{{wsl_exe}}'
-        arguments: '-d Debian -e /home/benie/.config/tmux/system-info/system-info-WSL.sh'
-    disallow_start_if_on_batteries: false
-    stop_if_going_on_batteries: false
-    execution_time_limit: PT0S
-    logon_type: password
-    username: '{{ansible_user}}'
-    password: '{{ansible_password}}'
-    multiple_instances: 3
-    run_level: limited
-    start_when_available: true
-    wake_to_run: false
+# - name: create system-info-WSL.sh scheduled task
+#   win_scheduled_task:
+#     path: Benie
+#     name: system-info-WSL.sh
+#     state: present
+#     enable: true
+#     triggers:
+#       - type: logon
+#         enabled: true
+#       - type: registration
+#         enabled: true
+#     actions:
+#       - path: '{{wsl_exe}}'
+#         arguments: '-d Debian -e /home/benie/.config/tmux/system-info/system-info-WSL.sh'
+#     disallow_start_if_on_batteries: false
+#     stop_if_going_on_batteries: false
+#     execution_time_limit: PT0S
+#     logon_type: password
+#     username: '{{ansible_user}}'
+#     password: '{{ansible_password}}'
+#     multiple_instances: 3
+#     run_level: limited
+#     start_when_available: true
+#     wake_to_run: false
 
 # - TODO: configure firewall
diff --git a/roles/system-info/templates/system-info.service.j2 b/roles/system-info/templates/system-info.service.j2
new file mode 100644
index 0000000..ee8bcf2
--- /dev/null
+++ b/roles/system-info/templates/system-info.service.j2
@@ -0,0 +1,9 @@
+[Unit]
+Description=System Info
+
+[Service]
+ExecStart={{SYSTEM_INFO_SCRIPT}}
+Environment=LC_ALL=C.UTF-8
+
+[Install]
+WantedBy=default.target