diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb4faed43ce85b9cfd6801cf89ad1d102f9b72ef..ab32a2acf4f451ae7b06de6371aba176253daabe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,12 +42,11 @@ prep-deploy:
     - ls -l /tmp
     - openstack image create --container-format bare --disk-format raw --file /tmp/xdmod-dev-volume-snap.raw xdmod-snapshot-image
     - IMAGE_ID=$(openstack image show -f value -c id xdmod-snapshot-image)
-    - openstack volume create --size 20 --image $IMAGE_ID xdmod-ci-volume
-    - openstack volume snapshot create --force --volume xdmod-ci-volume xdmod-dev-volume-snap   
+    
     - |
       if [ "$TARGET_ENV" = "dev" ]; then
            TF_VAR_data_volume="xdmod-dev-volume-$BUILD_DATE"
-           openstack volume create --snapshot xdmod-dev-volume-snap --size 20 $TF_VAR_data_volume
+           openstack volume create --size 20 --image $IMAGE_ID $TF_VAR_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