diff --git a/buildspec.yml b/buildspec.yml
index 8e5aa0a5..b9a8bf08 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -4,6 +4,7 @@ env:
   variables:
     #TF_IN_AUTOMATION: true
     TF_INPUT: 0
+    TF_VAR_env: ${ENV}
     TF_VAR_enable_critical_notifications: true
     TF_VAR_enable_authentication: true
     TF_VAR_admin_db_backup_retention_period: 30
@@ -60,7 +61,6 @@ phases:
 
   build:
     commands:
-      - export TF_VAR_env=${ENV}
       - export AWS_DEFAULT_REGION=eu-west-2
       - terraform init -no-color --backend-config="key=terraform.$ENV.state"
       - terraform workspace new $ENV || true