diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2843d87a4f004791ac1b903075293877738749c..6dfab4704844524486da51f2b57662bb41943411 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,10 +136,8 @@ production-deploy:
   tags: [build]
   script:
     - export prod_instance_id=$(openstack floating ip show $prod_floating_ip -c port_details -f value | awk -F', ' '{print $2}' | awk -F"'" '{print $2}')
-    - export prod_volumes=($(openstack server show $prod_instance_id -c volumes_attached -f value | awk -F"'" '{print $4}'))    # Iterate over the array and perform actions for each volume
-    - for prod_volume in "${prod_volumes[@]}"; do
-      - echo "Detaching prod_volume_id=${prod_volume} from prod_instance_id=${prod_instance_id}"
-    - done
+    - export prod_volume=$(openstack server show $prod_instance_id -c volumes_attached -f value | awk -F"'" '{print $4}')
+    - export prod_queue_volume=$(openstack server show $prod_instance_id -c volumes_attached -f value | awk -F"'" '{print $4}' | awk 'NR==2')
 
     - |
       eval $(ssh-agent -s)
@@ -150,8 +148,8 @@ production-deploy:
     - 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
      - 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 remove volume $prod_instance_id $prod_volume
+    - openstack server remove volume $prod_instance_id $prod_queue_volume
     - openstack server stop $prod_instance_id
 
     # Exporting Staging Volume IDs