diff --git a/emby/build.json b/emby/build.json
index 353c1d54a..1b53da239 100644
--- a/emby/build.json
+++ b/emby/build.json
@@ -1,7 +1,7 @@
 {
   "build_from": {
-    "aarch64": "lscr.io/linuxserver/emby:arm64v8-beta",
-    "amd64": "lscr.io/linuxserver/emby:amd64-beta"
+    "aarch64": "lscr.io/linuxserver/emby:arm64v8-latest",
+    "amd64": "lscr.io/linuxserver/emby:amd64-latest"
   },
   "codenotary": {
     "signer": "alexandrep.github@gmail.com"
diff --git a/emby/config.json b/emby/config.json
index 3cd29fb68..57ef9a534 100644
--- a/emby/config.json
+++ b/emby/config.json
@@ -73,6 +73,9 @@
     "/dev/nvme1",
     "/dev/nvme2"
   ],
+  "environment": {
+    "data_location": "/config/database"
+  },
   "host_network": true,
   "image": "ghcr.io/alexbelgium/emby-{arch}",
   "ingress": true,
@@ -80,12 +83,12 @@
   "ingress_stream": true,
   "init": false,
   "map": [
-    "config:rw",
+    "addon_config:rw",
     "share:rw",
     "media:rw",
     "ssl:rw"
   ],
-  "name": "Emby NAS",
+  "name": "Emby",
   "options": {
     "PGID": 0,
     "PUID": 0,
@@ -121,9 +124,9 @@
     "silent": "bool?",
     "smbv1": "bool?"
   },
-  "slug": "emby_nas",
+  "slug": "emby",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby",
-  "version": "4.9.0.48",
+  "version": "4.8.11.0",
   "video": true
 }
diff --git a/emby/rootfs/etc/cont-init.d/20-folders.sh b/emby/rootfs/etc/cont-init.d/20-folders.sh
deleted file mode 100755
index 86353b89a..000000000
--- a/emby/rootfs/etc/cont-init.d/20-folders.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# shellcheck shell=bash
-set -e
-
-bashio::log.info "Updating folder structure and permission"
-
-echo "Internal location : /emby"
-mkdir -p /emby
-chown -R "$PUID:$PGID" /emby
-
-echo "Files location : /share/storage/tv"
-mkdir -p /share/storage/tv
-chown -R "$PUID:$PGID" /share/storage/tv
-
-echo "Files location : /share/storage/movies"
-mkdir -p /share/storage/movies
-chown -R "$PUID:$PGID" /share/storage/movies
-
-echo "Data location : /share/emby"
-mkdir -p /share/emby
-chown -R "$PUID:$PGID" /share/emby
-
-echo "Config location : /config/addons_config/emby"
-mkdir -p /config/addons_config/emby
-chown -R "$PUID:$PGID" /config/addons_config/emby
-
-# links
-
-if [ ! -d /emby/cache ]; then
-    echo "... link for /emby/cache"
-    mkdir -p /share/emby/cache
-    chown -R "$PUID:$PGID" /share/emby/cache
-    ln -s /share/emby/cache /emby/cache
-fi
-
-if [ ! -d /emby/config ]; then
-    echo "Creating link for /emby/config"
-    mkdir -p /config/emby
-    chown -R "$PUID:$PGID" /config/emby
-    ln -s /config/emby /emby/config
-fi
-
-if [ ! -d /emby/data ]; then
-    echo "Creating link for /emby/data"
-    mkdir -p /share/emby/data
-    chown -R "$PUID:$PGID" /share/emby/data
-    ln -s /share/emby/data /emby/data
-fi
-
-if [ ! -d /emby/logs ]; then
-    echo "Creating link for /emby/logs"
-    mkdir -p /share/emby/logs
-    chown -R "$PUID:$PGID" /share/emby/logs
-    ln -s /share/emby/logs /emby/logs
-fi
-
-if [ ! -d /emby/metadata ]; then
-    echo "Creating link for /emby/metadata"
-    mkdir -p /share/emby/metadata
-    chown -R "$PUID:$PGID" /share/emby/metadata
-    ln -s /share/emby/metadata /emby/metadata
-fi
-
-if [ ! -d /emby/plugins ]; then
-    echo "Creating link for /emby/plugins"
-    mkdir -p /share/emby/plugins
-    chown -R "$PUID:$PGID" /share/emby/plugins
-    ln -s /share/emby/plugins /emby/plugins
-fi
-
-if [ ! -d /emby/root ]; then
-    echo "Creating link for /emby/root"
-    mkdir -p /share/emby/root
-    chown -R "$PUID:$PGID" /share/emby/root
-    ln -s /share/emby/root /emby/root
-fi
diff --git a/emby/updater.json b/emby/updater.json
index 7c6abf81c..a030cf539 100644
--- a/emby/updater.json
+++ b/emby/updater.json
@@ -1,9 +1,9 @@
 {
-  "github_beta": "true",
+  "github_beta": "false",
   "last_update": "19-04-2025",
   "repository": "alexbelgium/hassio-addons",
   "slug": "emby",
   "source": "github",
   "upstream_repo": "linuxserver/docker-emby",
-  "upstream_version": "4.9.0.48"
+  "upstream_version": "4.8.11.0"
 }
diff --git a/emby/CHANGELOG.md b/emby_beta/CHANGELOG.md
similarity index 98%
rename from emby/CHANGELOG.md
rename to emby_beta/CHANGELOG.md
index ff5a70efb..95b95d0c2 100644
--- a/emby/CHANGELOG.md
+++ b/emby_beta/CHANGELOG.md
@@ -1,3 +1,4 @@
+- WARNING : migration of config to addon_config instead of homeassistant config folder. Allows automatic backups. The location of the database however is not changed.
 
 ## 4.9.0.48 (19-04-2025)
 - Update to latest version from linuxserver/docker-emby (changelog : https://github.com/linuxserver/docker-emby/releases)
diff --git a/emby/Dockerfile b/emby_beta/Dockerfile
similarity index 100%
rename from emby/Dockerfile
rename to emby_beta/Dockerfile
diff --git a/emby/README.md b/emby_beta/README.md
similarity index 100%
rename from emby/README.md
rename to emby_beta/README.md
diff --git a/emby/apparmor.txt b/emby_beta/apparmor.txt
similarity index 100%
rename from emby/apparmor.txt
rename to emby_beta/apparmor.txt
diff --git a/emby_beta/build.json b/emby_beta/build.json
new file mode 100644
index 000000000..353c1d54a
--- /dev/null
+++ b/emby_beta/build.json
@@ -0,0 +1,9 @@
+{
+  "build_from": {
+    "aarch64": "lscr.io/linuxserver/emby:arm64v8-beta",
+    "amd64": "lscr.io/linuxserver/emby:amd64-beta"
+  },
+  "codenotary": {
+    "signer": "alexandrep.github@gmail.com"
+  }
+}
diff --git a/emby_beta/config.json b/emby_beta/config.json
new file mode 100644
index 000000000..a1c8e174f
--- /dev/null
+++ b/emby_beta/config.json
@@ -0,0 +1,133 @@
+{
+  "arch": [
+    "aarch64",
+    "amd64"
+  ],
+  "backup_exclude": [
+    "*/cache/",
+    "*/transcoding-temp/",
+    "*/logs/*"
+  ],
+  "codenotary": "alexandrep.github@gmail.com",
+  "description": "A free Software Media System that puts you in control of managing and streaming your media (beta version)",
+  "devices": [
+    "/dev/dri",
+    "/dev/dri/card0",
+    "/dev/dri/card1",
+    "/dev/dri/renderD128",
+    "/dev/vchiq",
+    "/dev/video10",
+    "/dev/video11",
+    "/dev/video12",
+    "/dev/video13",
+    "/dev/video14",
+    "/dev/video15",
+    "/dev/video16",
+    "/dev/ttyUSB0",
+    "/dev/sda",
+    "/dev/sdb",
+    "/dev/sdc",
+    "/dev/sdd",
+    "/dev/sde",
+    "/dev/sdf",
+    "/dev/sdg",
+    "/dev/nvme",
+    "/dev/nvme0",
+    "/dev/nvme0n1",
+    "/dev/nvme0n1p1",
+    "/dev/nvme0n1p2",
+    "/dev/nvme0n1p3",
+    "/dev/nvme1n1",
+    "/dev/nvme1n1p1",
+    "/dev/nvme1n1p2",
+    "/dev/nvme1n1p3",
+    "/dev/nvme2n1",
+    "/dev/nvme2n1p1",
+    "/dev/nvme2n1p2",
+    "/dev/nvme2n3p3",
+    "/dev/mmcblk",
+    "/dev/fuse",
+    "/dev/sda1",
+    "/dev/sdb1",
+    "/dev/sdc1",
+    "/dev/sdd1",
+    "/dev/sde1",
+    "/dev/sdf1",
+    "/dev/sdg1",
+    "/dev/sda2",
+    "/dev/sdb2",
+    "/dev/sdc2",
+    "/dev/sdd2",
+    "/dev/sde2",
+    "/dev/sdf2",
+    "/dev/sdg2",
+    "/dev/sda3",
+    "/dev/sdb3",
+    "/dev/sda4",
+    "/dev/sdb4",
+    "/dev/sda5",
+    "/dev/sda6",
+    "/dev/sda7",
+    "/dev/sda8",
+    "/dev/nvme0",
+    "/dev/nvme1",
+    "/dev/nvme2"
+  ],
+  "environment": {
+    "data_location": "/share/emby"
+  },
+  "host_network": true,
+  "image": "ghcr.io/alexbelgium/emby-{arch}",
+  "ingress": true,
+  "ingress_port": 0,
+  "ingress_stream": true,
+  "init": false,
+  "map": [
+    "addon_config:rw",
+    "homeassistant_config:rw",
+    "share:rw",
+    "media:rw",
+    "ssl:rw"
+  ],
+  "name": "Emby Beta",
+  "options": {
+    "PGID": 0,
+    "PUID": 0,
+    "silent": true
+  },
+  "panel_admin": false,
+  "panel_icon": "mdi:emby",
+  "ports": {
+    "1900/udp": null,
+    "7359/udp": null,
+    "8096/tcp": 8096,
+    "8920/tcp": null
+  },
+  "ports_description": {
+    "1900/udp": "dlna (optional)",
+    "7359/udp": "udp server discover (optional)",
+    "8096/tcp": "web interface",
+    "8920/tcp": "https web interface (optional)"
+  },
+  "privileged": [
+    "SYS_ADMIN",
+    "DAC_READ_SEARCH"
+  ],
+  "schema": {
+    "PGID": "int",
+    "PUID": "int",
+    "TZ": "str?",
+    "cifsdomain": "str?",
+    "cifspassword": "str?",
+    "cifsusername": "str?",
+    "localdisks": "str?",
+    "networkdisks": "str?",
+    "silent": "bool?",
+    "smbv1": "bool?"
+  },
+  "slug": "emby_nas",
+  "udev": true,
+  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby",
+  "version": "4.9.0.48_test",
+  "video": true
+}
diff --git a/emby/icon.png b/emby_beta/icon.png
similarity index 100%
rename from emby/icon.png
rename to emby_beta/icon.png
diff --git a/emby/logo.png b/emby_beta/logo.png
similarity index 100%
rename from emby/logo.png
rename to emby_beta/logo.png
diff --git a/emby_beta/rootfs/etc/cont-init.d/20-folders.sh b/emby_beta/rootfs/etc/cont-init.d/20-folders.sh
new file mode 100644
index 000000000..1ac076244
--- /dev/null
+++ b/emby_beta/rootfs/etc/cont-init.d/20-folders.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/with-contenv bashio
+# shellcheck shell=bash
+set -e
+
+data_location="${data_location:-/share/emby}"
+config_location="/config/emby"
+log() {
+    bashio::log.info "$1"
+}
+
+log "Updating folder structure and permission : data stored in $data_location"
+
+declare -A directories=(
+    ["/emby"]=""
+    ["/share/storage/tv"]=""
+    ["/share/storage/movies"]=""
+    ["$data_location"]=""
+    ["$config_location"]=""
+)
+
+for dir in "${!directories[@]}"; do
+    log "Creating directory: $dir"
+    mkdir -p "$dir"
+    chown -R "$PUID:$PGID" "$dir"
+done
+
+if [ -d /homeassistant/emby ]; then
+    log "Migrate previous config location"
+    cp -rf /homeassistant/emby/* "$config_location"/
+    mv /homeassistant/emby /homeassistant/emby_migrated
+    chown -R "$PUID:$PGID" "$config_location"
+fi
+
+declare -A links=(
+    ["/emby/cache"]="$data_location/cache"
+    ["/emby/config"]="$config_location"
+    ["/emby/data"]="$data_location/data"
+    ["/emby/logs"]="$data_location/logs"
+    ["/emby/metadata"]="$data_location/metadata"
+    ["/emby/plugins"]="$data_location/plugins"
+    ["/emby/root"]="$data_location/root"
+)
+
+for link in "${!links[@]}"; do
+    if [ ! -d "$link" ]; then
+        log "Creating link for $link"
+        mkdir -p "${links[$link]}"
+        chown -R "$PUID:$PGID" "${links[$link]}"
+        ln -s "${links[$link]}" "$link"
+    fi
+done
diff --git a/emby/rootfs/etc/cont-init.d/32-nginx.sh b/emby_beta/rootfs/etc/cont-init.d/32-nginx.sh
old mode 100755
new mode 100644
similarity index 100%
rename from emby/rootfs/etc/cont-init.d/32-nginx.sh
rename to emby_beta/rootfs/etc/cont-init.d/32-nginx.sh
diff --git a/emby/rootfs/etc/cont-init.d/91-silent.sh b/emby_beta/rootfs/etc/cont-init.d/91-silent.sh
old mode 100755
new mode 100644
similarity index 100%
rename from emby/rootfs/etc/cont-init.d/91-silent.sh
rename to emby_beta/rootfs/etc/cont-init.d/91-silent.sh
diff --git a/emby/rootfs/etc/nginx/includes/mime.types b/emby_beta/rootfs/etc/nginx/includes/mime.types
similarity index 100%
rename from emby/rootfs/etc/nginx/includes/mime.types
rename to emby_beta/rootfs/etc/nginx/includes/mime.types
diff --git a/emby/rootfs/etc/nginx/includes/proxy_params.conf b/emby_beta/rootfs/etc/nginx/includes/proxy_params.conf
similarity index 100%
rename from emby/rootfs/etc/nginx/includes/proxy_params.conf
rename to emby_beta/rootfs/etc/nginx/includes/proxy_params.conf
diff --git a/emby/rootfs/etc/nginx/includes/resolver.conf b/emby_beta/rootfs/etc/nginx/includes/resolver.conf
similarity index 100%
rename from emby/rootfs/etc/nginx/includes/resolver.conf
rename to emby_beta/rootfs/etc/nginx/includes/resolver.conf
diff --git a/emby/rootfs/etc/nginx/includes/server_params.conf b/emby_beta/rootfs/etc/nginx/includes/server_params.conf
similarity index 100%
rename from emby/rootfs/etc/nginx/includes/server_params.conf
rename to emby_beta/rootfs/etc/nginx/includes/server_params.conf
diff --git a/emby/rootfs/etc/nginx/includes/ssl_params.conf b/emby_beta/rootfs/etc/nginx/includes/ssl_params.conf
similarity index 100%
rename from emby/rootfs/etc/nginx/includes/ssl_params.conf
rename to emby_beta/rootfs/etc/nginx/includes/ssl_params.conf
diff --git a/emby/rootfs/etc/nginx/includes/upstream.conf b/emby_beta/rootfs/etc/nginx/includes/upstream.conf
similarity index 100%
rename from emby/rootfs/etc/nginx/includes/upstream.conf
rename to emby_beta/rootfs/etc/nginx/includes/upstream.conf
diff --git a/emby/rootfs/etc/nginx/nginx.conf b/emby_beta/rootfs/etc/nginx/nginx.conf
similarity index 100%
rename from emby/rootfs/etc/nginx/nginx.conf
rename to emby_beta/rootfs/etc/nginx/nginx.conf
diff --git a/emby/rootfs/etc/nginx/servers/ingress.conf b/emby_beta/rootfs/etc/nginx/servers/ingress.conf
similarity index 100%
rename from emby/rootfs/etc/nginx/servers/ingress.conf
rename to emby_beta/rootfs/etc/nginx/servers/ingress.conf
diff --git a/emby/rootfs/etc/services.d/nginx/finish b/emby_beta/rootfs/etc/services.d/nginx/finish
similarity index 100%
rename from emby/rootfs/etc/services.d/nginx/finish
rename to emby_beta/rootfs/etc/services.d/nginx/finish
diff --git a/emby/rootfs/etc/services.d/nginx/run b/emby_beta/rootfs/etc/services.d/nginx/run
similarity index 100%
rename from emby/rootfs/etc/services.d/nginx/run
rename to emby_beta/rootfs/etc/services.d/nginx/run
diff --git a/emby_beta/stats.png b/emby_beta/stats.png
new file mode 100644
index 000000000..fb14c18d9
Binary files /dev/null and b/emby_beta/stats.png differ
diff --git a/emby_beta/updater.json b/emby_beta/updater.json
new file mode 100644
index 000000000..7c6abf81c
--- /dev/null
+++ b/emby_beta/updater.json
@@ -0,0 +1,9 @@
+{
+  "github_beta": "true",
+  "last_update": "19-04-2025",
+  "repository": "alexbelgium/hassio-addons",
+  "slug": "emby",
+  "source": "github",
+  "upstream_repo": "linuxserver/docker-emby",
+  "upstream_version": "4.9.0.48"
+}