diff --git a/base/init.sls b/base/init.sls
index 114f3d1..a20a227 100644
--- a/base/init.sls
+++ b/base/init.sls
@@ -10,3 +10,4 @@ include:
   - prometheus
   - rsyslog
   - sudoers
+  - systemd
diff --git a/hardware/raspberrypi/fan/init.sls b/hardware/raspberrypi/fan/init.sls
index 88277c7..527cfa5 100644
--- a/hardware/raspberrypi/fan/init.sls
+++ b/hardware/raspberrypi/fan/init.sls
@@ -1,11 +1,26 @@
+{%
+set has_fan = salt['pillar.get'](
+  'hardware:raspberrypi:fan:has_fan',
+  default=False
+)
+%}
+
+include:
+  - systemd.units
 
 file-fan-control:
   file:
     - managed
-    - name: /usr/local/bin/fan_ctrl.py
+    - name: {{ salt['pillar.get']('hardware:raspberrypi:fan:controller') }}
     - source: salt://hardware/raspberrypi/fan/files/fan_ctrl.py
     - user: root
     - group: root
     - mode: 0755
 
-
+{{ salt['pillar.get']('hardware:raspberrypi:fan:service_name') }}:
+  service.running:
+    - enable: {{ has_fan }}
+    - reload: {{ has_fan }}
+    - watch:
+      - file: {{ salt['pillar.get']('hardware:raspberrypi:fan:controller') }}
+ 
diff --git a/hardware/raspberrypi/init.sls b/hardware/raspberrypi/init.sls
index 7dab148..2a2dcab 100644
--- a/hardware/raspberrypi/init.sls
+++ b/hardware/raspberrypi/init.sls
@@ -1,7 +1,7 @@
  
 {%
 set has_fan = salt['pillar.get'](
-  'hardware:raspberrypi:has_fan',
+  'hardware:raspberrypi:fan:has_fan',
   default=False
 )
 %}