diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index 3879b7efdd9e224813b480fda4cdcecb245f32b9..c0d0f28b3cf3a6ec1e00c6fcebfc475bd8cecf3b 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -73,9 +73,9 @@ stages:
         fi
       fi
     fi
-    export $DBREQUIRED
+    echo "DBREQUIRED=${DBREQUIRED}" >> validation.env
     if [[ "$DBREQUIRED" == "yes" ]]; then
-      echo "DB need to be pulled."
+      echo "DB needs to be pulled."
     else
       echo "No pulling required."
     fi
@@ -83,6 +83,9 @@ stages:
     variables:
       - $CAE
       - $DISABLE_CI_TESTS
+  artifacts:
+    reports:
+      dotenv: validation.env
 
 .build:
   stage: build
@@ -133,6 +136,8 @@ stages:
       ascr drupal-dump-db ${CI_PROJECT_PATH} ${PWD}/${CI_PROJECT_NAME}.sql master
     fi
   cache: {}
+  dependencies:
+    - 'Validate Environment'
   artifacts:
     name: dbdump
     when: always
@@ -170,6 +175,7 @@ stages:
       - $CAE
       - $DISABLE_CI_TESTS
   dependencies:
+    - 'Validate Environment'
     - 'Build Site'
     - 'Download DB'
 
@@ -194,6 +200,7 @@ stages:
       - $CAE
       - $DISABLE_CI_TESTS
   dependencies:
+    - 'Validate Environment'
     - 'Build Site'
 
 .theme: