diff --git a/terraform/account-wide-infrastructure/dev/secrets.tf b/terraform/account-wide-infrastructure/dev/secrets.tf
index dfd3333f0..5e60405d8 100644
--- a/terraform/account-wide-infrastructure/dev/secrets.tf
+++ b/terraform/account-wide-infrastructure/dev/secrets.tf
@@ -43,7 +43,6 @@ resource "aws_secretsmanager_secret" "devsandbox_environment_configuration" {
 }
 
 resource "aws_secretsmanager_secret" "powerbi_gw_instance_admin_pwd" {
-  count       = var.enable_reporting && var.enable_powerbi_auto_push ? 1 : 0
   name        = "${local.project}--dev-powerbi-gw-instance-admin-pwd"
   description = "Admin password for the PowerBI Gateway EC2 instance"
 }
diff --git a/terraform/account-wide-infrastructure/prod/ec2.tf b/terraform/account-wide-infrastructure/prod/ec2.tf
index 310265b60..544f31a23 100644
--- a/terraform/account-wide-infrastructure/prod/ec2.tf
+++ b/terraform/account-wide-infrastructure/prod/ec2.tf
@@ -12,7 +12,7 @@ module "vpc" {
 module "powerbi_gw_instance" {
   count              = var.enable_reporting && var.enable_powerbi_auto_push ? 1 : 0
   source             = "../modules/powerbi-gw-ec2"
-  use_custom_ami     = false
+  use_custom_ami     = var.use_powerbi_gw_custom_ami
   instance_type      = var.powerbi_gw_instance_type
   name_prefix        = "nhsd-nrlf--prod-powerbi-gw"
   target_bucket_arn  = module.prod-glue.target_bucket_arn
diff --git a/terraform/account-wide-infrastructure/prod/secrets.tf b/terraform/account-wide-infrastructure/prod/secrets.tf
index 1cfdfb908..f269927eb 100644
--- a/terraform/account-wide-infrastructure/prod/secrets.tf
+++ b/terraform/account-wide-infrastructure/prod/secrets.tf
@@ -23,7 +23,6 @@ resource "aws_secretsmanager_secret" "prod_environment_configuration" {
 }
 
 resource "aws_secretsmanager_secret" "powerbi_gw_instance_admin_pwd" {
-  count       = var.enable_reporting && var.enable_powerbi_auto_push ? 1 : 0
   name        = "${local.project}--prod-powerbi-gw-instance-admin-pwd"
   description = "Admin password for the PowerBI Gateway EC2 instance"
 }
diff --git a/terraform/account-wide-infrastructure/prod/vars.tf b/terraform/account-wide-infrastructure/prod/vars.tf
index 0431523ff..68b4602f5 100644
--- a/terraform/account-wide-infrastructure/prod/vars.tf
+++ b/terraform/account-wide-infrastructure/prod/vars.tf
@@ -54,7 +54,7 @@ variable "instance_type" {
 variable "enable_powerbi_auto_push" {
   type        = bool
   description = "Enable automatic pushing of info into PowerBI"
-  default     = false
+  default     = true
 }
 
 variable "powerbi_gw_instance_type" {
@@ -66,5 +66,5 @@ variable "powerbi_gw_instance_type" {
 variable "use_powerbi_gw_custom_ami" {
   type        = bool
   description = "Use custom image for PowerBI GW instance"
-  default     = false
+  default     = true
 }
diff --git a/terraform/account-wide-infrastructure/test/secrets.tf b/terraform/account-wide-infrastructure/test/secrets.tf
index 23cea404c..d431c29c7 100644
--- a/terraform/account-wide-infrastructure/test/secrets.tf
+++ b/terraform/account-wide-infrastructure/test/secrets.tf
@@ -108,7 +108,6 @@ resource "aws_secretsmanager_secret" "ref_environment_configuration" {
 # PowerBI secrets
 #
 resource "aws_secretsmanager_secret" "powerbi_gw_instance_admin_pwd" {
-  count       = var.enable_reporting && var.enable_powerbi_auto_push ? 1 : 0
   name        = "${local.project}--test-powerbi-gw-instance-admin-pwd"
   description = "Admin password for the PowerBI Gateway EC2 instance"
 }