diff --git a/terraform/aks/config/preproduction.tfvars.json b/terraform/aks/config/preproduction.tfvars.json
index 10cd32a6..6702a1b2 100644
--- a/terraform/aks/config/preproduction.tfvars.json
+++ b/terraform/aks/config/preproduction.tfvars.json
@@ -4,6 +4,7 @@
   "cluster_name": "s189t01-tsc-test-aks",
   "namespace": "tra-test",
   "environment": "preproduction",
+  "environment_short_name": "preprod",
   "deploy_azure_backing_services": true,
   "key_vault_name": "s189t01-ccbl-pp-kv",
   "key_vault_app_secret_name": "CCBL-APP-SECRETS-PREPRODUCTION",
diff --git a/terraform/aks/config/production.tfvars.json b/terraform/aks/config/production.tfvars.json
index 2c47d656..95225838 100644
--- a/terraform/aks/config/production.tfvars.json
+++ b/terraform/aks/config/production.tfvars.json
@@ -4,6 +4,7 @@
   "cluster_name": "s189p01-tsc-production-aks",
   "namespace": "tra-production",
   "environment": "production",
+  "environment_short_name": "production",
   "deploy_azure_backing_services": true,
   "key_vault_name": "s189p01-ccbl-pd-kv",
   "key_vault_app_secret_name": "CCBL-APP-SECRETS-PRODUCTION",
diff --git a/terraform/aks/config/review.tfvars.json b/terraform/aks/config/review.tfvars.json
index ee390baf..af14cd2f 100644
--- a/terraform/aks/config/review.tfvars.json
+++ b/terraform/aks/config/review.tfvars.json
@@ -4,6 +4,7 @@
   "cluster_name": "s189t01-tsc-test-aks",
   "namespace": "tra-development",
   "environment": "review",
+  "environment_short_name": "review",
   "deploy_azure_backing_services": false,
   "enable_postgres_ssl": false,
   "key_vault_name": "s189t01-ccbl-rv-kv",
diff --git a/terraform/aks/config/test.tfvars.json b/terraform/aks/config/test.tfvars.json
index 0f3ac8b7..8632d629 100644
--- a/terraform/aks/config/test.tfvars.json
+++ b/terraform/aks/config/test.tfvars.json
@@ -4,6 +4,7 @@
   "cluster_name": "s189t01-tsc-test-aks",
   "namespace": "tra-development",
   "environment": "test",
+  "environment_short_name": "test",
   "deploy_azure_backing_services": true,
   "key_vault_name": "s189t01-ccbl-ts-kv",
   "key_vault_app_secret_name": "CCBL-APP-SECRETS-TEST",
diff --git a/terraform/aks/variables.tf b/terraform/aks/variables.tf
index 24117cf6..18e32486 100644
--- a/terraform/aks/variables.tf
+++ b/terraform/aks/variables.tf
@@ -153,7 +153,7 @@ locals {
     local.app_config,
     {
       BIGQUERY_PROJECT_ID = "teaching-qualifications",
-      BIGQUERY_DATASET    = "ccbl_events_${var.environment}",
+      BIGQUERY_DATASET    = "ccbl_events_${var.environment_short_name}",
       BIGQUERY_TABLE_NAME = "events",
       DB_SSLMODE = local.postgres_ssl_mode,
       HOSTING_ENVIRONMENT = var.environment,