diff --git a/www-apps/beszel-hub/Manifest b/www-apps/beszel-hub/Manifest
index cab0c31..7ad1459 100644
--- a/www-apps/beszel-hub/Manifest
+++ b/www-apps/beszel-hub/Manifest
@@ -1,5 +1,5 @@
-AUX beszel-hub.env 293 BLAKE2B 2b2927cd26d779696e252d43c9dc66cf6e522e8e922a841af7968263a488b391a387f7765d1c8ef5072ef3693cb2fc7db074a8331bda12012f0130e2842d5c1f SHA512 22f3870c3e3a2a62aed206c3331f11c001e0a3b06d3d83352c23ba86a6ae6f6d14e84b7b6cbace0116e5be986383715eedfb9f8f3c7a2bd5812ec319f80a2b16
-AUX beszel-hub.service 564 BLAKE2B 54b6bd68d29c87dbd8ca127e981270e4ad80a6f75e6b6b4e15ee251c294f383d5a6bd7874e4864cf80a9b626553bbadb64e96d79c60a3d96922dabc16063f0e5 SHA512 10ff529f629ae7a45ecaf1b9f17273b75fe561166e9add49de2a907612bb64b17d6ca4f1bdd319eda13c15bf9f0b32a8d26d12d8beee02caaa536fccf873df48
+AUX beszel-hub.env 692 BLAKE2B 234f6bc028384593dfc1ff3c5c0258ccdf62017cf3f0fff88757e72846ecb349638ff4e3c860690a3babcd0111ab10e76858b7498d3a617024c278835d639b7d SHA512 07a453e22a6ac3a144b87a6fd8d5357a57cbd9ce80408dbca3245e7855fe7b15b53e1008460f57e148796e0825474c3addc246fadd7f38b4336698ccfb8c8192
+AUX beszel-hub.service 625 BLAKE2B 42378df8d1e7d757b7b355022a6a35c67af304db6c47108d5c54ccefb118bd80da1a9f9e3ba8ed2b3dfdfa298f768d51147e0cec7decc65a2ca9659ffa3a5fa5 SHA512 939a81cb4d9bbd818ee2d4b0379b3d6aa263ebca0cfb4ce2b167297dc93e4f68e8c1ff24824f2c019f4bfbb2805c9eeb26ad01a536f70d90c72e56d6db0c2fa1
 DIST beszel-0.18.3-vendor.tar.xz 29845172 BLAKE2B 7c1e7e40c60614553dfa312d1891a677a987be5191447670d14f07b0a95933d2b9884b11b6914e74d20166a9be20bf6e3a86f1d6f296cd953d049ed17bc4631a SHA512 b959211fcd7e3a8c5abb3d46dedca883fbd85493f502d716538d0c76bfa08796e40dd8000306f8f9dcfb20e3886847d272a695553e669910168a059ecd31b461
 DIST beszel-hub-0.18.3-site.tar.xz 942380 BLAKE2B 44ccfc53c50cd5ea13adb0ebb96bdffa1283c1bd19600e4735296bfd9d3f6b77b4a5c0654aa20d6475969a45a26c112813b1fa29041fddc366f6e26ebc5d1476 SHA512 3b4ccb343c64523e1e4066d0b207b66ef8a0012f3af3e8bdc23d11af4fdc7c36e97868ee6b6997a07537df765fd465e12a5132f81d4fdda18a57b5841290b7df
 DIST beszel-hub-0.18.3.tar.gz 1153782 BLAKE2B 13458446ed3d80c9409161bc17b54fbde6dc5da6cbf9d65c42a65c5ec236e34dcc7fe131173cb08cc9b5df30b435952bd36c643a87a29fd8a65d5b844de62aa5 SHA512 c4abbe9b28b79ec3206b401b29fcc6c49531c9b2e946909df11d3ac8430099d455d391e49d67503f8fa831b6c514d5efb7f67845f1ab4788e81ff80a9a4521cf
diff --git a/www-apps/beszel-hub/files/beszel-hub.env b/www-apps/beszel-hub/files/beszel-hub.env
index 458460f..a94c398 100644
--- a/www-apps/beszel-hub/files/beszel-hub.env
+++ b/www-apps/beszel-hub/files/beszel-hub.env
@@ -5,3 +5,13 @@
 # The application URL. Used for links in emails and notigications. Must set
 # if serving at a subpath.
 #BESZEL_HUB_APP_URL=https://beszel.example.com
+
+# The following variables are not official Beszel Hub environment variables.
+# Instead, they are used as parameters for command line options.
+# Set the listen address and port for HTTP connections. Leave empty for
+# default 127.0.0.1:8090
+#BESZEL_HUB_SERVE_HTTP=localhost:9080
+
+# Set the listen address and port for HTTPS connections. Leave empty for
+# default - disabled.
+#BESZEL_HUB_SERVE_HTTPS=
diff --git a/www-apps/beszel-hub/files/beszel-hub.service b/www-apps/beszel-hub/files/beszel-hub.service
index 308d2eb..e8f1b06 100644
--- a/www-apps/beszel-hub/files/beszel-hub.service
+++ b/www-apps/beszel-hub/files/beszel-hub.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=Beszel Hub Service
-After=network-online.target
-Wants=network-online.target
+After=network.target
 
 [Service]
-ExecStart=/usr/bin/beszel-hub --dir /var/lib/beszel-hub
-EnvironmentFile=/etc/beszel-hub/beszel-hub.env
-Restart=on-failure
+Type=simple
+Restart=always
 RestartSec=5
-StateDirectory=beszel-hub
+ExecStart=/usr/bin/beszel-hub serve --dir /var/lib/beszel-hub/data --http ${BESZEL_HUB_SERVE_HTTP} --https ${BESZEL_HUB_SERVE_HTTPS}
+WorkingDirectory=/var/lib/beszel-hub
+EnvironmentFile=/etc/beszel-hub/beszel-hub.env
 
 User=beszel-hub
 Group=beszel