diff --git a/moonlight/moonlight-web-stream.container b/moonlight/moonlight-web-stream.container
new file mode 100644
index 0000000..38189e1
--- /dev/null
+++ b/moonlight/moonlight-web-stream.container
@@ -0,0 +1,34 @@
+[Unit]
+ConditionPathIsDirectory=/mnt/data/containers/moonlight-web-stream/data
+#Requires=authentik.service nginx.service
+#After=authentik.service nginx.service
+
+[Container]
+ContainerName=moonlight
+Image=docker.io/mrcreativ3001/moonlight-web-stream:latest
+AutoUpdate=registry
+EnvironmentFile=/mnt/data/containers/moonlight-web-stream/.env.moonlight
+
+Volume=/mnt/data/containers/moonlight-web-stream/data:/moonlight-web/server
+
+#Environment=UID=1000
+#Environment=GID=1000
+
+PublishPort=8451:8080
+#PublishPort40000-40100:40000-40100/udp
+
+Label=homepage.group=Life
+Label=homepage.name=Moonlight
+Label=homepage.icon=moonlight.png
+Label=homepage.href=https://remote.inkletblot.com
+Label=homepage.description="Remote desktop"
+
+[Service]
+Restart=on-failure
+RestartSteps=5
+RestartMaxDelaySec=2min
+# Extend Timeout to allow time to pull the image
+TimeoutStartSec=900
+
+[Install]
+WantedBy=default.target
diff --git a/navidrome/navidrome.container b/navidrome/navidrome.container
index 3c55a03..d9ed46c 100644
--- a/navidrome/navidrome.container
+++ b/navidrome/navidrome.container
@@ -28,6 +28,7 @@ Label=homepage.description="Music Streaming"
 
 [Service]
 Restart=always
+# Extend Timeout to allow time to pull the image
 TimeoutStartSec=900
 
 [Install]