diff --git a/terraform/account-wide-infrastructure/dev/vars.tf b/terraform/account-wide-infrastructure/dev/vars.tf
index adb15d24a..5ebb7464c 100644
--- a/terraform/account-wide-infrastructure/dev/vars.tf
+++ b/terraform/account-wide-infrastructure/dev/vars.tf
@@ -59,7 +59,7 @@ variable "enable_powerbi_auto_push" {
 variable "powerbi_gw_instance_type" {
   type        = string
   description = "Type for PowerBI GW EC2 Instance"
-  default     = "t2.micro"
+  default     = "t2.medium"
 }
 
 variable "use_powerbi_gw_custom_ami" {
diff --git a/terraform/account-wide-infrastructure/prod/vars.tf b/terraform/account-wide-infrastructure/prod/vars.tf
index d999261f5..9f3acf808 100644
--- a/terraform/account-wide-infrastructure/prod/vars.tf
+++ b/terraform/account-wide-infrastructure/prod/vars.tf
@@ -60,7 +60,7 @@ variable "enable_powerbi_auto_push" {
 variable "powerbi_gw_instance_type" {
   type        = string
   description = "Type for PowerBI GW EC2 Instance"
-  default     = "t2.micro"
+  default     = "t2.medium"
 }
 
 variable "use_powerbi_gw_custom_ami" {
diff --git a/terraform/account-wide-infrastructure/test/vars.tf b/terraform/account-wide-infrastructure/test/vars.tf
index 144929512..7598ff13f 100644
--- a/terraform/account-wide-infrastructure/test/vars.tf
+++ b/terraform/account-wide-infrastructure/test/vars.tf
@@ -74,7 +74,7 @@ variable "enable_powerbi_auto_push" {
 variable "powerbi_gw_instance_type" {
   type        = string
   description = "Type for PowerBI GW EC2 Instance"
-  default     = "t2.micro"
+  default     = "t2.medium"
 }
 
 variable "use_powerbi_gw_custom_ami" {
diff --git a/terraform/infrastructure/lambda.tf b/terraform/infrastructure/lambda.tf
index c934452db..feb2f8729 100644
--- a/terraform/infrastructure/lambda.tf
+++ b/terraform/infrastructure/lambda.tf
@@ -322,7 +322,7 @@ module "consumer__status" {
     local.pointers_kms_read_write_arn,
     local.auth_store_read_policy_arn
   ]
-  firehose_subscriptions = local.firehose_lambda_subscriptions
+  firehose_subscriptions = local.firehost_lambda_splunk_only_subscription
   handler                = "status.handler"
   retention              = var.log_retention_period
 }
@@ -351,7 +351,7 @@ module "producer__status" {
     local.pointers_kms_read_write_arn,
     local.auth_store_read_policy_arn
   ]
-  firehose_subscriptions = local.firehose_lambda_subscriptions
+  firehose_subscriptions = local.firehost_lambda_splunk_only_subscription
   handler                = "status.handler"
   retention              = var.log_retention_period
 }
diff --git a/terraform/infrastructure/locals.tf b/terraform/infrastructure/locals.tf
index 957788553..8f96c9137 100644
--- a/terraform/infrastructure/locals.tf
+++ b/terraform/infrastructure/locals.tf
@@ -32,9 +32,16 @@ locals {
 
   reporting_bucket_arn = data.aws_s3_bucket.source-data-bucket.arn
   reporting_kms_arn    = data.aws_kms_key.glue.arn
-  firehose_lambda_subscriptions = var.use_shared_resources ? {
-    "splunk_subscription" : module.firehose__processor[0].firehose_subscription,
-    "reports_subscription" : module.firehose__processor[0].firehose_reporting_subscription
+  firehose_lambda_subscriptions = var.use_shared_resources ? (
+    var.enable_reporting ? {
+      "splunk_subscription"  = module.firehose__processor[0].firehose_subscription,
+      "reports_subscription" = module.firehose__processor[0].firehose_reporting_subscription
+      } : {
+      "splunk_subscription" = module.firehose__processor[0].firehose_subscription
+    }
+  ) : {}
+  firehost_lambda_splunk_only_subscription = var.use_shared_resources ? {
+    "splunk_subscription" : module.firehose__processor[0].firehose_subscription
   } : {}
   splunk_environment = local.is_sandbox_env ? "${var.account_name}sandbox" : var.account_name
   splunk_index       = "aws_recordlocator_${local.splunk_environment}"