diff --git a/compose.yml b/compose.yml
index 20533de..93e395e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -100,7 +100,7 @@ services:
                     echo "Updating qBit to port: $$CLEAN_PORT";
                     sleep 10;
                     echo "Updated to $$CLEAN_PORT"
-                    curl -s -X POST -d "json={\"listen_port\":$$CLEAN_PORT}" http://localhost:2161/api/v2/app/setPreferences;
+                    curl -s -X POST -d "json={\"listen_port\":$$CLEAN_PORT}" http://localhost:${QBITTORRENT_PORT}/api/v2/app/setPreferences;
 
                     # 4. Success! Now sleep for a long time (e.g., 1 hour)
                     sleep 3600 & wait $$!;
@@ -209,8 +209,8 @@ services:
         volumes:
             - /home/shaan/torrent-stack/lidarr:/music
             - /var/lib/lidarr:/config
-            - /mnt/media:/media
-            - /mnt/11tb_ext:/11tb_ext
+            - ${DISK1}:${DISK1}
+            - ${DISK2}:${DISK2}
         labels:
             - "autoheal=true"
         network_mode: "container:gluetun"
diff --git a/homepage/widgets.yaml b/homepage/widgets.yaml
index 41231ca..8bbfdb6 100644
--- a/homepage/widgets.yaml
+++ b/homepage/widgets.yaml
@@ -33,9 +33,9 @@
       uptime: true # disabled by default
       disk: # disabled by default, use mount point of disk(s) in glances. Can also be a list (see below)
           - /
-          - /host/mnt/media
-          - /host/mnt/11tb_ext
-          - /host/mnt/shaimpy
+          - "/host{{HOMEPAGE_VAR_DISK1}}"
+          - "/host{{HOMEPAGE_VAR_DISK2}}"
+          - "/host{{HOMEPAGE_VAR_DISK3}}"
       diskUnits: bytes # optional, bytes (default) or bbytes. Only applies to disk
       expanded: true # show the expanded view
       #label: MyMachine # optional