diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be680c42df7b5b29db90980cd24749633afa6304..d6ed1d45d0977c0003620a7888ab574e66f04015 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,13 +43,13 @@ prep-deploy:
            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_volume=$(openstack server show $prod_instance_id -c volumes_attached -f value | awk -F"'" '{print $4}')
            echo "Detaching prod_volume=${prod_volume} from prod_instance_id=${prod_instance_id} and creating a snapshot"
-           openstack server stop $prod_instance_id
+           openstack server stop $prod_instance_id && openstack server show $prod_instance_id 
            openstack server remove volume $prod_instance_id $prod_volume
            openstack volume snapshot create --volume $prod_volume xdmod-prod-vol-snapshot-$BUILD_DATE
 
            echo "Reattach the prod_volume=${prod_volume} to prod_instance_id=${prod_instance_id} after snapshot is created"
-           openstack server start $prod_instance_id
            openstack server add volume $prod_instance_id $prod_volume --device /dev/vdb
+           openstack server start $prod_instance_id
 
            echo "Make a copy of prod volume $prod_volume to be used in tf-apply"
            TF_VAR_data_volume="xdmod-prod-vol-$BUILD_DATE"