diff --git a/octocam_generic.service b/octocam_generic.service
deleted file mode 100644
index 452dc8f..0000000
--- a/octocam_generic.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=the OctoPi(buntu) webcam daemon with the user specified config
-After=network.online.target
-Wants=network.online.target
-
-[Service]
-User=OCTOUSER
-Environment="LD_LIBRARY_PATH=/home/OCTOUSER/mjpg-streamer"
-ExecStart=/home/OCTOUSER/mjpg-streamer/mjpg_streamer -i "input_uvc.so -d /dev/OCTOCAM -r RESOLUTION -f FRAMERATE" -o "output_http.so -p CAMPORT"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/octocam_ustream.service b/octocam_ustream.service
index 452dc8f..b6e0559 100644
--- a/octocam_ustream.service
+++ b/octocam_ustream.service
@@ -1,12 +1,11 @@
 [Unit]
-Description=the OctoPi(buntu) webcam daemon with the user specified config
+Description=the OctoPi(buntu) ustreamer daemon with the user specified config
 After=network.online.target
 Wants=network.online.target
 
 [Service]
 User=OCTOUSER
-Environment="LD_LIBRARY_PATH=/home/OCTOUSER/mjpg-streamer"
-ExecStart=/home/OCTOUSER/mjpg-streamer/mjpg_streamer -i "input_uvc.so -d /dev/OCTOCAM -r RESOLUTION -f FRAMERATE" -o "output_http.so -p CAMPORT"
+ExecStart=/home/OCTOUSER/ustreamer/ustreamer -d /dev/OCTOCAM -m MJPEG -r RESOLUTION -f FRAMERATE -p CAMPORT --device-timeout 8 --device-error-delay 8
 
 [Install]
 WantedBy=multi-user.target
diff --git a/octoprint_deploy.sh b/octoprint_deploy.sh
index 0a3e0d1..9321c07 100755
--- a/octoprint_deploy.sh
+++ b/octoprint_deploy.sh
@@ -401,7 +401,7 @@ add_camera() {
     fi
     echo "Selected camera resolution: $RESOLUTION" | log
     #TODO check formating
-    echo "Camera Framerate (no sanity check, so get it right) [default: 5]:"
+    echo "Camera Framerate (use 0 for ustreamer hardware) [default: 5]:"
     read FRAMERATE
     if [ -z "$FRAMERATE" ]; then
         FRAMERATE=5
@@ -726,6 +726,8 @@ remove_everything() {
         echo "Removing template"
         rm -rf /home/$user/.octoprint
         rm -rf /home/$user/OctoPrint
+        systemctl daemon-reload
+        
 
     fi