diff --git a/service/camera-streamer-arducam-16MP.service b/service/camera-streamer-arducam-16MP.service
index 50a2f62..09d3af4 100644
--- a/service/camera-streamer-arducam-16MP.service
+++ b/service/camera-streamer-arducam-16MP.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=camera-streamer web camera
+Description=camera-streamer web camera for ArduCAM 16MP on Raspberry PI
 After=network.target
 ConditionPathExists=/sys/bus/i2c/drivers/imx519/10-001a/video4linux
 
diff --git a/service/camera-streamer-arducam-64MP.service b/service/camera-streamer-arducam-64MP.service
index 61b0e62..4afdd1e 100644
--- a/service/camera-streamer-arducam-64MP.service
+++ b/service/camera-streamer-arducam-64MP.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=camera-streamer web camera
+Description=camera-streamer web camera for ArduCAM 16MP on Raspberry PI
 After=network.target
 ConditionPathExists=/sys/bus/i2c/drivers/arducam_64mp/10-001a/video4linux
 
diff --git a/service/camera-streamer-generic-usb-cam.service b/service/camera-streamer-generic-usb-cam.service
new file mode 100644
index 0000000..822deb3
--- /dev/null
+++ b/service/camera-streamer-generic-usb-cam.service
@@ -0,0 +1,30 @@
+[Unit]
+Description=camera-streamer web camera for USB camera on Generic platform
+After=network.target
+ConditionPathExistsGlob=/dev/v4l/by-id/usb-*-video-index0
+
+[Service]
+ExecStart=/usr/local/bin/camera-streamer \
+  -camera-path=/dev/video0 \
+  -camera-format=JPEG \
+  -camera-width=1920 -camera-height=1080 \
+  -camera-fps=30 \
+  ; use two memory buffers to optimise usage
+  -camera-nbufs=3 \
+  ; disable video streaming (WebRTC, RTSP, H264)
+  ; on non-supported platforms
+  -camera-video.disabled
+
+DynamicUser=yes
+SupplementaryGroups=video i2c
+Restart=always
+RestartSec=10
+Nice=10
+IOSchedulingClass=idle
+IOSchedulingPriority=7
+CPUWeight=20
+AllowedCPUs=1-2
+MemoryMax=250M
+
+[Install]
+WantedBy=multi-user.target
diff --git a/service/camera-streamer-usb-cam.service b/service/camera-streamer-raspi-usb-cam.service
similarity index 88%
rename from service/camera-streamer-usb-cam.service
rename to service/camera-streamer-raspi-usb-cam.service
index 124f38a..38e603b 100644
--- a/service/camera-streamer-usb-cam.service
+++ b/service/camera-streamer-raspi-usb-cam.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=camera-streamer web camera
+Description=camera-streamer web camera for USB camera on Raspberry PI
 After=network.target
 ConditionPathExistsGlob=/dev/v4l/by-id/usb-*-video-index0
 
@@ -10,7 +10,7 @@ ExecStart=/usr/local/bin/camera-streamer \
   -camera-width=1920 -camera-height=1080 \
   -camera-fps=30 \
   ; use two memory buffers to optimise usage
-  -camera-nbufs=2 \
+  -camera-nbufs=3 \
   ; the high-res is 1920x1080
   -camera-snapshot.height=1080 \
   ; the video/webrtc is 1280x720
diff --git a/service/camera-streamer-raspi-v2-8MP.service b/service/camera-streamer-raspi-v2-8MP.service
index ec54c5d..d3a7e14 100644
--- a/service/camera-streamer-raspi-v2-8MP.service
+++ b/service/camera-streamer-raspi-v2-8MP.service
@@ -3,7 +3,7 @@
 ; https://www.raspberrypi.com/products/camera-module-v2/
 ;
 [Unit]
-Description=camera-streamer web camera
+Description=camera-streamer web camera for Pi Camera v2.1 8MP on Raspberry PI
 After=network.target
 ConditionPathExists=/sys/bus/i2c/drivers/imx219/10-0010/video4linux
 
diff --git a/service/camera-streamer-raspi-v3-12MP.service b/service/camera-streamer-raspi-v3-12MP.service
index 20fff51..35c5c6a 100644
--- a/service/camera-streamer-raspi-v3-12MP.service
+++ b/service/camera-streamer-raspi-v3-12MP.service
@@ -3,7 +3,7 @@
 ; https://www.raspberrypi.com/products/camera-module-3/
 ;
 [Unit]
-Description=camera-streamer web camera
+Description=camera-streamer web camera for Pi Camera Module 3 12MP on Raspberry PI
 After=network.target
 ConditionPathExists=/sys/bus/i2c/drivers/imx708/10-001a/video4linux