diff --git a/deployment/deploy_vm.sh b/deployment/deploy_vm.sh
index 9ff82a6..2634411 100755
--- a/deployment/deploy_vm.sh
+++ b/deployment/deploy_vm.sh
@@ -68,7 +68,7 @@ if ! incus list --format csv | grep -q "$INCUS_VM_NAME"; then
         DOCKER_DISK_SIZE_GB="$BTCPAYSERVER_DOCKER_DISK_SIZE_GB"
     fi
     
-    DOCKER_VOLUME_NAME="$PRIMARY_DOMAIN_IDENTIFIER-$VM_ID""d"
+    DOCKER_VOLUME_NAME="$VIRTUAL_MACHINE-docker"
     if ! incus storage volume list ss-base | grep -q "$DOCKER_VOLUME_NAME"; then
         incus storage volume create ss-base "$DOCKER_VOLUME_NAME" --type=block
     fi
@@ -76,7 +76,7 @@ if ! incus list --format csv | grep -q "$INCUS_VM_NAME"; then
     # TODO ensure we are only GROWING the volume--never shrinking
     incus storage volume set ss-base "$DOCKER_VOLUME_NAME" size="${DOCKER_DISK_SIZE_GB}GB"
 
-    SSDATA_VOLUME_NAME="$PRIMARY_DOMAIN_IDENTIFIER-$VM_ID""s"
+    SSDATA_VOLUME_NAME="$VIRTUAL_MACHINE-ss-data"
     if ! incus storage volume list ss-base | grep -q "$SSDATA_VOLUME_NAME"; then
         incus storage volume create ss-base "$SSDATA_VOLUME_NAME" --type=filesystem
     fi
@@ -85,7 +85,7 @@ if ! incus list --format csv | grep -q "$INCUS_VM_NAME"; then
     incus storage volume set ss-base "$SSDATA_VOLUME_NAME" size="${SSDATA_DISK_SIZE_GB}GB"
 
 
-    BACKUP_VOLUME_NAME="$PRIMARY_DOMAIN_IDENTIFIER-$VM_ID""b"
+    BACKUP_VOLUME_NAME="$VIRTUAL_MACHINE-backup"
     if ! incus storage volume list ss-base | grep -q "$BACKUP_VOLUME_NAME"; then
         incus storage volume create ss-base "$BACKUP_VOLUME_NAME" --type=filesystem
     fi
diff --git a/deployment/down.sh b/deployment/down.sh
index e59177c..d6e9cd3 100755
--- a/deployment/down.sh
+++ b/deployment/down.sh
@@ -99,17 +99,10 @@ for VIRTUAL_MACHINE in $SERVERS; do
     fi
 
     if [ "$KEEP_DOCKER_VOLUME" = false ]; then
-        # destroy the docker volume
-        VM_ID=w
-        if [ "$VIRTUAL_MACHINE" = btcpayserver ]; then
-            VM_ID="b"
-        elif [ "$VIRTUAL_MACHINE" = lnplayserver ]; then
-            VM_ID="c"
-        fi
 
         # d for docker; b for backup; s for ss-data
-        for DATA in d b s; do
-            VOLUME_NAME="$PRIMARY_DOMAIN_IDENTIFIER-$VM_ID""$DATA"
+        for DATA in docker backup ss-data; do
+            VOLUME_NAME="$VIRTUAL_MACHINE-$DATA"
             if incus storage volume list ss-base -q | grep -q "$VOLUME_NAME"; then
                 RESPONSE=
                 read -r -p "Are you sure you want to delete the '$VOLUME_NAME' volume intended for '$INCUS_VM_NAME'?": RESPONSE