diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97c639a9788384a8b3b91e1547e06c167aedc996..6c4d55d948af2b9eb81f8a09e9f908d7447a2ce8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ prep-deploy:
   environment:
     name: $TARGET_ENV
   script:
-    - export BUILD_DATE=$(TZ=America/Chicago date +%Y-%m-%d-%H-%M-%S)
+    - export BUILD_DATE=$(TZ=America/Chicago date +%Y-%m-%dT%H%M%S)
     - |
       if [ "$TARGET_ENV" = "dev" ]; then
            TF_VAR_data_volume="xdmod-dev-volume-$BUILD_DATE"
@@ -77,9 +77,8 @@ tf-apply:
   script:
     - echo "TF_VAR_data_volume=${TF_VAR_data_volume}"
     - echo "TF_VAR_flavor=${TF_VAR_flavor}"
-    - export BUILD_DATE=$(TZ=America/Chicago date +%Y%m%d%H%M%S)
     - export TF_VAR_internal_network="xdmod-packer-clusternet-$BUILD_DATE"
-    - | 
+    - |
       if [ -z $TF_VAR_image_ohpc ];
       then
       XDMOD_IMAGES=($(openstack image list --sort-column Name --sort-descending -f value -c Name -c ID | grep -P " xdmod-${TARGET_ENV}-\d{14}$" | awk '{print $2}'))
@@ -87,7 +86,7 @@ tf-apply:
       echo $TF_VAR_image_ohpc
       else
       echo "image_ohpc defined as ${TF_VAR_image_ohpc}"
-      fi   
+      fi
     - export TF_VAR_keypair_name="os-gen-keypair-$BUILD_DATE"
     - |
       terraform apply -auto-approve