diff --git a/containers/trilium/docker-compose.yml b/containers/trilium/docker-compose.yml
index ced8eb3..06ef057 100755
--- a/containers/trilium/docker-compose.yml
+++ b/containers/trilium/docker-compose.yml
@@ -5,7 +5,7 @@ networks:
 services:
   trilium-service: #LIBREPORTAL|SERVICE_TAG_1|trilium-service
     container_name: trilium-service
-    image: zadam/trilium:latest #LIBREPORTAL|TRILIUM_VERSION_TAG|latest
+    image: triliumnext/trilium:latest #LIBREPORTAL|TRILIUM_VERSION_TAG|latest
     restart: unless-stopped
     hostname: trilium
     # GLUETUN_OFF_BEGIN
@@ -27,6 +27,11 @@ services:
       # TRAEFIK_PORT_1_END
     healthcheck:
       disable: HEALTHCHECK_DATA #LIBREPORTAL|HEALTHCHECK_TAG|HEALTHCHECK_DATA
+    # Set explicitly, as upstream's own compose does. The path is unchanged from
+    # the zadam image, which is what makes this a drop-in: an existing instance
+    # keeps its database and TriliumNext opens it as-is.
+    environment:
+      - TRILIUM_DATA_DIR=/home/node/trilium-data
     volumes:
       - "./trilium-data/:/home/node/trilium-data"
     # GLUETUN_OFF_BEGIN
diff --git a/containers/trilium/trilium.config b/containers/trilium/trilium.config
index 5e29eb7..4913ac7 100755
--- a/containers/trilium/trilium.config
+++ b/containers/trilium/trilium.config
@@ -33,7 +33,7 @@ CFG_TRILIUM_CATEGORY="knowledge"
 CFG_TRILIUM_TITLE="Trilium"
 CFG_TRILIUM_DESCRIPTION="Notes & Knowledge Management"
 CFG_TRILIUM_LONG_DESCRIPTION="Trilium Notes is a hierarchical note-taking application with focus on building a personal knowledge base and productivity"
-CFG_TRILIUM_URL="https://github.com/zadam/trilium"
+CFG_TRILIUM_URL="https://github.com/TriliumNext/Trilium"
 CFG_TRILIUM_ACTIONS="configure|install|restart|shutdown|uninstall"
 #
 # =============================================================================