diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14a0a7922c3a4c3f8d6771a4cb0362497c595835..2fb92ff044aee0de1f8a80e48bf1aaa698650406 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,12 +61,12 @@ prep-deploy:
            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-dev-vol-$BUILD_DATE"
+           TF_VAR_data_volume="xdmod-prod-vol-$BUILD_DATE"
            openstack volume create --snapshot xdmod-prod-vol-snapshot-$BUILD_DATE --size 150 $TF_VAR_data_volume
 
-           echo "Make a copy of prod volume $prod_volume to be used in tf-apply"
-           TF_VAR_xdmod_queue_data_volume="xdmod-prod-vol-$BUILD_DATE"
-           openstack volume create --snapshot xdmod-prod_queue_volume-snapshot-$BUILD_DATE --size 1 $TF_VAR_xdmod_queue_data_volume
+           echo "Make a copy of prod queue volume $prod_volume to be used in tf-apply"
+           TF_VAR_xdmod_queue_data_volume="xdmod-prod-queue-vol-$BUILD_DATE"
+           openstack volume create --snapshot xdmod-prod-queue-vol-snapshot-$BUILD_DATE --size 1 $TF_VAR_xdmod_queue_data_volume
       else
            echo "Unknown TARGET_ENV: $TARGET_ENV"
            exit 1