diff --git a/templates/compose/qbittorrent.yaml b/templates/compose/qbittorrent.yaml
index 718a32ab8..f7a4ad878 100644
--- a/templates/compose/qbittorrent.yaml
+++ b/templates/compose/qbittorrent.yaml
@@ -8,13 +8,13 @@ services:
   qbit:
     image: "lscr.io/linuxserver/qbittorrent:latest"
     environment:
-      - WEBUI_PORT=8080
+      - WEBUI_PORT=${WEBUI_PORT:-8080}
       - PUID=1000
       - PGID=1000
     volumes:
-      - "data-qbittorrent:/config"
-      - "data-downloads:/downloads"
-      - "data-torrents:/torrents"
+      - qbittorrent-config:/config
+      - qbittorrent-downloads:/downloads
+      - qbittorrent-torrents:/torrents
     healthcheck:
       test:
         - CMD
@@ -25,16 +25,17 @@ services:
       interval: 5s
       timeout: 20s
       retries: 10
+
   vuetorrent-backend:
     image: "ghcr.io/vuetorrent/vuetorrent-backend:latest"
     environment:
       - SERVICE_FQDN_QBITORRENT_8080
-      - PORT=8080
-      - "QBIT_BASE=http://qbit:8080"
-      - RELEASE_TYPE=stable
-      - "UPDATE_VT_CRON=0 * * * *"
+      - PORT=${WEBUI_PORT:-8080}
+      - QBIT_BASE=${SERVICE_FQDN_QBITORRENT}
+      - RELEASE_TYPE=${RELEASE_TYPE:-stable}
+      - UPDATE_VT_CRON=${UPDATE_VT_CRON:-"0 * * * *"}
     volumes:
-      - "data-config:/config"
+      - vuetorrent-config:/config
     healthcheck:
       test:
         - CMD