diff --git a/emby.container b/emby.container
index 8f99328..749eaed 100644
--- a/emby.container
+++ b/emby.container
@@ -2,22 +2,20 @@
 Description=Emby Media Server
 
 [Container]
-ContainerName=emby
+ContainerName=embyserver
 Image=docker.io/emby/embyserver:latest
 AutoUpdate=registry
 PublishPort=8096:8096
 PublishPort=8920:8920
 Network=host
 Volume=emby-config:/config:Z
-Volume=/media/EMBY:/mnt/Videos
+Volume=/media/CONTAINER/Videos:/mnt/Videos
 AddDevice=/dev/dri/:/dev/dri/
 Environment=UID=1000
 Environment=GID=100
 Environment=GIDLIST=100
 
 [Service]
-# Inform systemd of additional exit status
-SuccessExitStatus=0 143
 Restart=unless-stopped
 # Give the container a moment to shut down gracefully
 TimeoutStopSec=30