diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 6bf36d0..5888a80 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -11,9 +11,7 @@
 (n2) {
 	reverse_proxy 192.168.1.4:{args.0}
 }
-(n2plus) {
-	reverse_proxy 192.168.1.10:{args.0}
-}
+
 # DNS
 (duckdns) {
 	tls {
@@ -41,28 +39,24 @@
 	}
     @wiki host wiki.quodatum.duckdns.org
 	handle @wiki {
-		 import n2 8088
+		 import omv 8088
 	}
-	@code host code.quodatum.duckdns.org
+	@code host wiki.quodatum.duckdns.org
 	handle @code {
-		 import n2plus 8444
+		 import n2 8444
 	}
     # Fallback for otherwise unhandled domains
 	handle {
 		abort
 	}
 }
-# orlop ------------------------------------
+# orlop
 *.orlop.duckdns.org {
    import duckdns
     @jellyfin host jellyfin.orlop.duckdns.org
 	handle @jellyfin {
 		 import omv 8096
 	}
-	@emby host emby.orlop.duckdns.org
-	handle @emby {
-		 import omv 8097
-	}
     # Fallback for otherwise unhandled domains
 	handle {
 		abort
@@ -82,6 +76,6 @@ xu4.local {
 	import auth
 
 	encode zstd gzip
-    root links
+    root link
     file_server browse
 }
diff --git a/emby/cache/.gitignore b/emby/cache/.gitignore
deleted file mode 100644
index 1e04ba0..0000000
--- a/emby/cache/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# .gitignore sample
-###################
-
-# Ignore all files in this dir...
-*
-
-# ... except for this one.
-!.gitignore
diff --git a/emby/config/.gitignore b/emby/config/.gitignore
deleted file mode 100644
index 1e04ba0..0000000
--- a/emby/config/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# .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
deleted file mode 100644
index 4576a5b..0000000
--- a/emby/docker-compose.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-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 
-    # https://forums.docker.com/t/docker-errors-invalidargument-host-network-mode-is-incompatible-with-port-bindings/103492/14
-    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 b13a096..2ac9a5a 100644
--- a/gerbera/docker-compose.yml
+++ b/gerbera/docker-compose.yml
@@ -5,6 +5,7 @@ services:
     gerbera:
         image: gerbera/gerbera:1.9.2
         container_name: gerbera
+        restart: always
         volumes:
             - "/mnt/media/pictures:/media/pictures:ro"
             - "./videos:/media/videos:ro"