diff --git a/tinymediamanager.container b/tinymediamanager.container
index 076ca09..2899ac1 100644
--- a/tinymediamanager.container
+++ b/tinymediamanager.container
@@ -2,12 +2,13 @@
 Description=tinymediamanager
 
 [Container]
+ContainerName=tinymediamanager
 Image=docker.io/tinymediamanager/tinymediamanager:latest
 AutoUpdate=registry
 PublishPort=4000:4000/tcp
 PublishPort=5900:5900/tcp
 Volume=tinymediamanager-data:/data:Z
-Volume=/media/EMBY:/mnt/Media
+Volume=/media/CONTAINER/Videos:/mnt/Media
 Environment=LC_ALL=en_US.UTF-8
 Environment=LANG=en_US.UTF-8
 Environment=ALLOW_DIRECT_VNC=true
@@ -15,7 +16,7 @@ Environment=USER_ID=1000
 Environment=GROUP_ID=1000
 
 [Service]
-Restart=always
+Restart=unless-stopped
 # Give the container a moment to shut down gracefully
 TimeoutStopSec=30