diff --git a/compose.yaml b/compose.yaml
index 81914a7..12d6434 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -55,7 +55,7 @@ services:
       - USER_ID=${USER_ID}
       - TORRUST_TRACKER_CONFIG_TOML=${TORRUST_TRACKER_CONFIG_TOML}
       - TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE:-e2e_testing_sqlite3}
-      - TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER:-Sqlite3}
+      - TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER=${TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER:-Sqlite3}
       - TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN=${TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN:-MyAccessToken}
     networks:
       - server_side
diff --git a/contrib/dev-tools/container/e2e/sqlite/mode/private/e2e-env-up.sh b/contrib/dev-tools/container/e2e/sqlite/mode/private/e2e-env-up.sh
index f719647..d457ef7 100755
--- a/contrib/dev-tools/container/e2e/sqlite/mode/private/e2e-env-up.sh
+++ b/contrib/dev-tools/container/e2e/sqlite/mode/private/e2e-env-up.sh
@@ -12,6 +12,6 @@ USER_ID=${USER_ID:-1000} \
     TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN="MyAccessToken" \
     TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.private.e2e.container.sqlite3.toml) \
     TORRUST_TRACKER_DATABASE="e2e_testing_sqlite3" \
-    TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER="Sqlite3" \
+    TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER="Sqlite3" \
     TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN="MyAccessToken" \
     docker compose up --detach --pull  always --remove-orphans
diff --git a/contrib/dev-tools/container/e2e/sqlite/mode/public/e2e-env-up.sh b/contrib/dev-tools/container/e2e/sqlite/mode/public/e2e-env-up.sh
index 9253eed..86616fa 100755
--- a/contrib/dev-tools/container/e2e/sqlite/mode/public/e2e-env-up.sh
+++ b/contrib/dev-tools/container/e2e/sqlite/mode/public/e2e-env-up.sh
@@ -12,6 +12,6 @@ USER_ID=${USER_ID:-1000} \
     TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN="MyAccessToken" \
     TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.public.e2e.container.sqlite3.toml) \
     TORRUST_TRACKER_DATABASE="e2e_testing_sqlite3" \
-    TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER="Sqlite3" \
+    TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER="Sqlite3" \
     TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN="MyAccessToken" \
     docker compose up --detach --pull  always --remove-orphans
diff --git a/docs/containerization_guide.md b/docs/containerization_guide.md
index 351e409..f54bfe6 100644
--- a/docs/containerization_guide.md
+++ b/docs/containerization_guide.md
@@ -288,7 +288,7 @@ USER_ID=${USER_ID:-1000} \
     TORRUST_INDEX_CONFIG_OVERRIDE_TRACKER__TOKEN="MyAccessToken" \
     TORRUST_TRACKER_CONFIG_TOML=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
     TORRUST_TRACKER_DATABASE="e2e_testing_sqlite3" \
-    TORRUST_TRACKER_CONFIG_OVERRIDE_DB_DRIVER="Sqlite3" \
+    TORRUST_TRACKER_CONFIG_OVERRIDE_CORE__DATABASE__DRIVER="Sqlite3" \
     TORRUST_TRACKER_CONFIG_OVERRIDE_HTTP_API__ACCESS_TOKENS__ADMIN="MyAccessToken" \
     docker compose up --detach --pull  always --remove-orphans    
 ```
diff --git a/share/default/config/tracker.private.e2e.container.sqlite3.toml b/share/default/config/tracker.private.e2e.container.sqlite3.toml
index 54f4152..568a7de 100644
--- a/share/default/config/tracker.private.e2e.container.sqlite3.toml
+++ b/share/default/config/tracker.private.e2e.container.sqlite3.toml
@@ -1,8 +1,11 @@
+[core]
 mode = "private"
-db_path = "/var/lib/torrust/tracker/database/e2e_testing_sqlite3.db"
+
+[core.database]
+path = "/var/lib/torrust/tracker/database/e2e_testing_sqlite3.db"
 
 [[udp_trackers]]
-enabled = false
+bind_address = "0.0.0.0:6969"
 
 [http_api]
 bind_address = "0.0.0.0:1212"
diff --git a/share/default/config/tracker.public.e2e.container.sqlite3.toml b/share/default/config/tracker.public.e2e.container.sqlite3.toml
index 3609560..71a05ef 100644
--- a/share/default/config/tracker.public.e2e.container.sqlite3.toml
+++ b/share/default/config/tracker.public.e2e.container.sqlite3.toml
@@ -1,4 +1,5 @@
-db_path = "/var/lib/torrust/tracker/database/e2e_testing_sqlite3.db"
+[core.database]
+path = "/var/lib/torrust/tracker/database/e2e_testing_sqlite3.db"
 
 [http_api]
 bind_address = "0.0.0.0:1212"