diff --git a/.env b/.env
index ffefda7..af850cb 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,4 @@
+REGISTRY_URL=registry.kucharczyk.xyz
 TZ=Europe/Prague
 STORAGE_PATH=/srv/mergerfs/storage
 DOCKER_STORAGE_PATH=/docker
diff --git a/beets.yml b/beets.yml
index 577a72c..afb6872 100644
--- a/beets.yml
+++ b/beets.yml
@@ -2,17 +2,16 @@
 version: "2.1"
 services:
   beets:
-#    image: lscr.io/linuxserver/beets:latest
-    image: registry.kucharczyk.xyz/beets:latest
+    image: ${REGISTRY_URL}/beets:latest
     container_name: beets
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
-      - TZ=Europe/Prague
+      - TZ=${TZ}
     volumes:
-      - /docker/beets:/config
-      - /srv/mergerfs/storage/media/music2:/music
-      - /srv/mergerfs/storage/download/music:/downloads
+      - "${DOCKER_STORAGE_PATH}/beets:/config"
+      - "${STORAGE_PATH}/media/music2:/music"
+      - "${STORAGE_PATH}/download/music:/downloads"
     ports:
       - 8337:8337
     restart: unless-stopped