diff --git a/.gitleaksignore b/.gitleaksignore
index cceb449a..4e90423c 100644
--- a/.gitleaksignore
+++ b/.gitleaksignore
@@ -1,3 +1,4 @@
 # SEE: https://github.com/gitleaks/gitleaks/blob/master/README.md#gitleaksignore
 
 cd9c0efec38c5d63053dd865e5d4e207c0760d91:docs/guides/Perform_static_analysis.md:generic-api-key:37
+fd71f4dcbbb6cb4957775afc718fb957fe8e9deb:scripts/golden-image/aib-template.json:ipv4:3
diff --git a/infrastructure/environments/production.tfvars b/infrastructure/environments/production.tfvars
index 06d9e846..ea480239 100644
--- a/infrastructure/environments/production.tfvars
+++ b/infrastructure/environments/production.tfvars
@@ -3,7 +3,7 @@ environment = "PROD"
 env_type    = "live"
 
 # See variable description
-virtual_desktop_group_active = "blue"
+virtual_desktop_group_active = "green"
 
 attached_environments = ["pre", "prd"]
 
diff --git a/infrastructure/variables.tf b/infrastructure/variables.tf
index 25fd2e09..a3bbd11b 100644
--- a/infrastructure/variables.tf
+++ b/infrastructure/variables.tf
@@ -412,8 +412,8 @@ variable "virtual_desktop_group_active" {
     This can either be 'blue', 'green', 'both-with-blue-primary',  'both-with-green-primary', 'both-with-blue-primary-but-equal-vms' or 'both-with-green-primary-but-equal-vms'.
     blue means only virtual desktop blue is deployed whilst virtual desktop green is removed.
     green means only virtual desktop green is deployed whilst virtual desktop blue is removed. Users are directed to group green.
-    both-blue-primary means both virtual desktop groups are deployed, but ONLY the platform users can see group green. All other users will be directed to group blue.
-    both-green-primary means both virtual desktop groups are deployed, but ONLY the platform users can see group blue. All other users will be directed to group green.
+    both-with-blue-primary means both virtual desktop groups are deployed, but ONLY the platform users can see group green. All other users will be directed to group blue.
+    both-with-green-primary means both virtual desktop groups are deployed, but ONLY the platform users can see group blue. All other users will be directed to group green.
     both-with-blue-primary-but-equal-vms means both virtual desktop groups are deployed with equal VM counts, but ONLY the platform users can see group green. All other users will be directed to group blue.
     both-with-green-primary-but-equal-vms means both virtual desktop groups are deployed with equal VM counts, but ONLY the platform users can see group blue. All other users will be directed to group green.
 
diff --git a/infrastructure/virtual_desktop.tf b/infrastructure/virtual_desktop.tf
index 503e58c6..24c48b04 100644
--- a/infrastructure/virtual_desktop.tf
+++ b/infrastructure/virtual_desktop.tf
@@ -103,9 +103,9 @@ module "virtual-desktop-v2" {
   resource_group_name       = azurerm_resource_group.avd-v2[each.key].name
   resource_group_id         = azurerm_resource_group.avd-v2[each.key].id
   scaling_plan_name         = module.config[each.key].names.avd-scaling-plan
-  source_image_id           = null
+  source_image_id           = var.AVD_SOURCE_IMAGE_ID
   source_image_reference    = null
-  source_image_from_gallery = var.avd_source_image_from_gallery
+  source_image_from_gallery = null
   subnet_id                 = module.subnets_hub["${module.config[each.key].names.subnet}-virtual-desktop"].id
   vm_count                  = local.green_avd_primary || local.equal_vm_counts ? var.avd_vm_count : 1
   vm_name_prefix            = "${module.config[each.key].names.avd-host}"