diff --git a/nenuscanner.service b/nenuscanner.service
new file mode 100644
index 0000000..a2b313c
--- /dev/null
+++ b/nenuscanner.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=NenuScanner
+After=network.target
+
+[Service]
+RestartSec=2s
+Type=simple
+User=pi
+Group=pi
+ExecStart=nenuscanner
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/src/nenuscanner/main.py b/src/nenuscanner/main.py
index 18f2627..568994e 100644
--- a/src/nenuscanner/main.py
+++ b/src/nenuscanner/main.py
@@ -1,8 +1,11 @@
 #!/usr/bin/env python
 
+import os
 from . import app
 from waitress import serve
 
 
 def main():
-    serve(app, listen='*:8000')
+    port = os.environ.get('FLASK_RUN_PORT', 80)
+    print(f'Starting server on port {port}')
+    serve(app, listen=f'*:{port}')