diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29dae5bdce6aee82e6088342bf1582a9638a3e5a..9e9c520cec93de5dfdb5f729be1502c41f7ce0ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,7 +149,9 @@ production-deploy:
       chmod 700 ~/.ssh
     - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$prod_floating_ip sudo systemctl stop mariadb
     - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$prod_floating_ip sudo umount /var/lib/mysql && df -h
-    - openstack server remove volume $prod_instance_id $prod_volume
+     - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$prod_floating_ip sudo umount /data/xdmod/queues && df -h
+    - openstack server remove volume $prod_instance_id $prod_volumes[0]
+    - openstack server remove volume $prod_instance_id $prod_volumes[1]
     - openstack server stop $prod_instance_id
 
     # Exporting Staging Volume IDs