diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index a57ace024988e111ff8d91dd5868e47bfa12aec7..a50648c9c65e3fd451ebc42ad3b4d3242acec18d 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -80,6 +80,7 @@ stages:
       - tags
     variables:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
+      - $CAE
 
 .dumpdb:
   stage: build
@@ -105,6 +106,7 @@ stages:
       - tags
     variables:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
+      - $CAE
 
 .importdb:
   stage: prepare
@@ -130,6 +132,7 @@ stages:
       - tags
     variables:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
+      - $CAE
   dependencies:
     - 'Build Site'
     - 'Download DB'
@@ -153,6 +156,7 @@ stages:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
       - $CI_COMMIT_MESSAGE =~ /\[re-build-db\]/i
       - $FORCE_DB_UPDATE == "yes"
+      - $CAE
   dependencies:
     - 'Build Site'
 
@@ -177,6 +181,7 @@ stages:
       - tags
     variables:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
+      - $CAE
 
 .phpunit:
   stage: test
@@ -203,6 +208,7 @@ stages:
       - tags
     variables:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
+      - $CAE
 
 .behat:
   stage: test
@@ -227,6 +233,7 @@ stages:
       - tags
     variables:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
+      - $CAE
 
 .backstop:
   stage: test
@@ -249,6 +256,7 @@ stages:
       - tags
     variables:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
+      - $CAE
 
 .deploy:
   stage: deploy
@@ -267,3 +275,4 @@ stages:
       - tags
     variables:
       - $CI_COMMIT_MESSAGE =~ /^Merge tag /i
+      - $CAE