diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b2680e6314369900fae538da3e13ed2e09bac27..12d9276cf925feb98cac399e4e2a286373e42d97 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,9 +35,9 @@ prep-deploy:
     - |
       if [ "$TARGET_ENV" = "dev" ]; then
            TF_VAR_data_volume="xdmod-dev-volume-$BUILD_DATE"
-           TF_VAR_data_queue_volume= "xdmod-queue-volume-$BUILD_DATE"
+           TF_VAR_xdmod_queue_data_volume= "xdmod-queue-volume-$BUILD_DATE"
            openstack volume create --snapshot xdmod-dev-volume-snap --size 20 $TF_VAR_data_volume
-           openstack volume create --snapshot xdmod-queue-volume-snap --size 20 $TF_VAR_data_queue_volume
+           openstack volume create --snapshot xdmod-queue-volume-snap --size 20 $TF_VAR_xdmod_queue_data_volume
       elif [ "$TARGET_ENV" = "staging" ]; then
            TF_VAR_data_volume="xdmod-staging-volume-$BUILD_DATE"
            openstack volume create --snapshot xdmod-staging-vol-snapshot --size 150 $TF_VAR_data_volume
@@ -63,6 +63,10 @@ prep-deploy:
            echo "Make a copy of prod volume $prod_volume to be used in tf-apply"
            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
       else
            echo "Unknown TARGET_ENV: $TARGET_ENV"
            exit 1