diff --git a/data_files/cosmicpi-dbcleaner.service b/data_files/cosmicpi-dbcleaner.service
index 6eec38c..7087e7b 100644
--- a/data_files/cosmicpi-dbcleaner.service
+++ b/data_files/cosmicpi-dbcleaner.service
@@ -2,8 +2,7 @@
 Description=Software for cleaning the local database from time to time, to keep it from exploding
 
 [Service]
-ExecStart=PYTHONPATH=/home/pi/cosmicpi-rpi_V1.5/ /home/pi/cosmicpi-rpi_V1.5/bin/dbcleaner
-WorkingDirectory=/home/pi/cosmicpi-rpi_V1.5/
+ExecStart=/usr/bin/cosmicpi-dbcleaner
 Restart=on-failure
 
 [Install]
diff --git a/data_files/cosmicpi-detector.service b/data_files/cosmicpi-detector.service
index de2f859..896d953 100644
--- a/data_files/cosmicpi-detector.service
+++ b/data_files/cosmicpi-detector.service
@@ -2,8 +2,7 @@
 Description=Software for connecting to the the CosmicPi detector
 
 [Service]
-ExecStart=PYTHONPATH=/home/pi/cosmicpi-rpi_V1.5/ /home/pi/cosmicpi-rpi_V1.5/bin/detector
-WorkingDirectory=/home/pi/cosmicpi-rpi_V1.5/
+ExecStart=/usr/bin/cosmicpi-detector
 Restart=on-failure
 
 [Install]
diff --git a/data_files/cosmicpi-mqtt.service b/data_files/cosmicpi-mqtt.service
index fe7cf10..fb76f6d 100644
--- a/data_files/cosmicpi-mqtt.service
+++ b/data_files/cosmicpi-mqtt.service
@@ -2,8 +2,7 @@
 Description=Software for sending locally stored events from the CosmicPi to an MQTT srver
 
 [Service]
-ExecStart=PYTHONPATH=/home/pi/cosmicpi-rpi_V1.5/ /home/pi/cosmicpi-rpi_V1.5/bin/mqtt
-WorkingDirectory=/home/pi/cosmicpi-rpi_V1.5/
+ExecStart=/usr/bin/cosmicpi-mqtt
 Restart=on-failure
 
 [Install]
diff --git a/data_files/cosmicpi-ui.service b/data_files/cosmicpi-ui.service
index b02c3f4..ee4f3b4 100644
--- a/data_files/cosmicpi-ui.service
+++ b/data_files/cosmicpi-ui.service
@@ -2,8 +2,7 @@
 Description=Software for the CosmicPi UI
 
 [Service]
-ExecStart=PYTHONPATH=/home/pi/cosmicpi-rpi_V1.5/ /home/pi/cosmicpi-rpi_V1.5/bin/ui
-WorkingDirectory=/home/pi/cosmicpi-rpi_V1.5/
+ExecStart=/usr/bin/cosmicpi-ui
 Restart=on-failure
 
 [Install]
diff --git a/setup.py b/setup.py
index 51a7292..607404b 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,12 @@ setup(name='cosmicpi',
         'cosmicpi.storage': ['cosmicpi.sqlite3'],
     },
     data_files=[
-        ('/etc/systemd/system/', ['data_files/*.service']),
+        ('/etc/systemd/system/', [
+            'data_files/cosmicpi-ui.service',
+            'data_files/cosmicpi-mqtt.service',
+            'data_files/cosmicpi-detector.service',
+            'data_files/cosmicpi-dbcleaner.service',
+        ]),
         ('/etc', ['data_files/cosmicpi.config']),
     ],
     install_requires=[