diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 608d2963faa7d74578c4e08b59a636497baa45c4..b40c139a350ea90951c97989e3b40e3f9dbb7c7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,13 +30,16 @@ prep-deploy:
   stage: .pre
   tags: [build]
   script:
+    - export BUILD_DATE=$(TZ=America/Chicago date +%Y-%m-%d-%H-%M-%S)
     - |
       if [ "$TARGET_ENV" = "dev" ]; then
-           TF_VAR_data_volume="xdmod-dev-volume"
+           TF_VAR_data_volume="xdmod-dev-volume-$BUILD_DATE"
            TF_VAR_flavor="m1.medium"
+           openstack volume create --snapshot xdmod-dev-snapshot --size 20 $TF_VAR_data_volume
       elif [ "$TARGET_ENV" = "staging" ]; then
-           TF_VAR_data_volume="xdmod-staging-volume"
+           TF_VAR_data_volume="xdmod-staging-volume-$BUILD_DATE"
            TF_VAR_flavor="m1.medium"
+           openstack volume create --snapshot xdmod-dev-snapshot --size 150 $TF_VAR_data_volume
       elif [ "$TARGET_ENV" = "production" ]; then
            TF_VAR_data_volume="xdmod-staging-volume"
            TF_VAR_flavor="m1.xlarge"