diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index cabaa8f..4ca55ce 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -52,7 +52,7 @@
 		abort
 	}
 }
-# orlop
+# orlop ------------------------------------
 *.orlop.duckdns.org {
    import duckdns
     @jellyfin host jellyfin.orlop.duckdns.org
diff --git a/emby/cache/.gitignore b/emby/cache/.gitignore
new file mode 100644
index 0000000..1e04ba0
--- /dev/null
+++ b/emby/cache/.gitignore
@@ -0,0 +1,8 @@
+# .gitignore sample
+###################
+
+# Ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore
diff --git a/emby/config/.gitignore b/emby/config/.gitignore
new file mode 100644
index 0000000..1e04ba0
--- /dev/null
+++ b/emby/config/.gitignore
@@ -0,0 +1,8 @@
+# .gitignore sample
+###################
+
+# Ignore all files in this dir...
+*
+
+# ... except for this one.
+!.gitignore
diff --git a/emby/docker-compose.yml b/emby/docker-compose.yml
new file mode 100644
index 0000000..c414518
--- /dev/null
+++ b/emby/docker-compose.yml
@@ -0,0 +1,23 @@
+version: "2.3"
+services:
+  emby:
+    image: emby/embyserver
+    container_name: embyserver
+    runtime: nvidia # Expose NVIDIA GPUs
+    network_mode: host # Enable DLNA and Wake-on-Lan
+    environment:
+      - UID=1000 # The UID to run emby as (default: 2)
+      - GID=100 # The GID to run emby as (default 2)
+      - GIDLIST=100 # A comma-separated list of additional GIDs to run emby as (default: 2)
+    volumes:
+        - ./config:/config
+        - ./cache:/cache
+        -  /srv/dev-disk-by-uuid-45e2e732-9e00-4a82-a7cc-9c743e033671/datastore/music:/music
+        -  /srv/dev-disk-by-uuid-45e2e732-9e00-4a82-a7cc-9c743e033671/datastore/PicasaStarter/pictures/Pictures:/photos
+    ports:
+      - 8097:8096 # HTTP port
+      - 8920:8920 # HTTPS port
+    devices:
+      - /dev/dri:/dev/dri # VAAPI/NVDEC/NVENC render nodes
+      - /dev/vchiq:/dev/vchiq # MMAL/OMX on Raspberry Pi
+    restart: unless-stopped
diff --git a/gerbera/docker-compose.yml b/gerbera/docker-compose.yml
index 2ac9a5a..b13a096 100644
--- a/gerbera/docker-compose.yml
+++ b/gerbera/docker-compose.yml
@@ -5,7 +5,6 @@ services:
     gerbera:
         image: gerbera/gerbera:1.9.2
         container_name: gerbera
-        restart: always
         volumes:
             - "/mnt/media/pictures:/media/pictures:ro"
             - "./videos:/media/videos:ro"