diff --git a/lambdas/store_asid_lookup/README.md b/lambdas/store_asid_lookup/README.md
index 4af8f505..eebe07cf 100644
--- a/lambdas/store_asid_lookup/README.md
+++ b/lambdas/store_asid_lookup/README.md
@@ -49,7 +49,7 @@ Once the email is received into the GP2GP mailbox, our team must (within the fir
 
     ```json
     {
-      "time": "YYY-MM-01T00:00:00Z"
+      "time": "YYYY-MM-01T00:00:00Z"
     }
     ```
 
diff --git a/stacks/email_and_alerting/terraform/email-report-lambda.tf b/stacks/email_and_alerting/terraform/email-report-lambda.tf
index 4bcd3100..3e6eff6a 100644
--- a/stacks/email_and_alerting/terraform/email-report-lambda.tf
+++ b/stacks/email_and_alerting/terraform/email-report-lambda.tf
@@ -46,7 +46,6 @@ resource "aws_lambda_permission" "allow_trigger_from_s3_object_created" {
 }
 
 resource "aws_s3_bucket_notification" "reports_generator_s3_object_created" {
-  count  = var.environment == "dev" ? 0 : 1
   bucket = data.aws_ssm_parameter.reports_generator_bucket_name.value
 
   lambda_function {
@@ -58,6 +57,3 @@ resource "aws_s3_bucket_notification" "reports_generator_s3_object_created" {
     aws_lambda_permission.allow_trigger_from_s3_object_created,
   ]
 }
-
-
-
diff --git a/stacks/email_and_alerting/terraform/moved-4.0.0.tf b/stacks/email_and_alerting/terraform/moved-4.0.0.tf
new file mode 100644
index 00000000..f735c207
--- /dev/null
+++ b/stacks/email_and_alerting/terraform/moved-4.0.0.tf
@@ -0,0 +1,4 @@
+moved {
+  from = aws_s3_bucket_notification.reports_generator_s3_object_created[0]
+  to   = aws_s3_bucket_notification.reports_generator_s3_object_created
+}
diff --git a/stacks/step_function/terraform/moved-4.0.0.tf b/stacks/step_function/terraform/moved-4.0.0.tf
new file mode 100644
index 00000000..205ab6ec
--- /dev/null
+++ b/stacks/step_function/terraform/moved-4.0.0.tf
@@ -0,0 +1,39 @@
+moved {
+  from = aws_cloudwatch_event_target.monthly_transfer_outcomes_per_supplier_pathway_report_event_trigger
+  to   = aws_cloudwatch_event_target.monthly_transfer_outcomes_per_supplier_pathway_report_event_trigger[0]
+}
+
+moved {
+  from = aws_cloudwatch_event_target.monthly_sicbl_level_integration_times_report_event_trigger
+  to   = aws_cloudwatch_event_target.monthly_sicbl_level_integration_times_report_event_trigger[0]
+}
+
+moved {
+  from = aws_cloudwatch_event_target.weekly_transfer_outcomes_per_supplier_pathway_report_event_trigger
+  to   = aws_cloudwatch_event_target.weekly_transfer_outcomes_per_supplier_pathway_report_event_trigger[0]
+}
+
+moved {
+  from = aws_cloudwatch_event_target.weekly_transfer_level_technical_failures_report_event_trigger
+  to   = aws_cloudwatch_event_target.weekly_transfer_level_technical_failures_report_event_trigger[0]
+}
+
+moved {
+  from = aws_cloudwatch_event_target.weekly_transfer_details_by_hour_report_event_trigger
+  to   = aws_cloudwatch_event_target.weekly_transfer_details_by_hour_report_event_trigger[0]
+}
+
+moved {
+  from = aws_cloudwatch_event_target.daily_transfer_outcomes_per_supplier_pathway_report_event_trigger
+  to   = aws_cloudwatch_event_target.daily_transfer_outcomes_per_supplier_pathway_report_event_trigger[0]
+}
+
+moved {
+  from = aws_cloudwatch_event_target.daily_transfer_level_technical_failures_report_event_trigger
+  to   = aws_cloudwatch_event_target.daily_transfer_level_technical_failures_report_event_trigger[0]
+}
+
+moved {
+  from = aws_cloudwatch_event_target.daily_transfer_details_by_hour_report_event_trigger
+  to   = aws_cloudwatch_event_target.daily_transfer_details_by_hour_report_event_trigger[0]
+}
diff --git a/stacks/step_function/terraform/reports-generator-event-triggers.tf b/stacks/step_function/terraform/reports-generator-event-triggers.tf
index c77ecf75..b6a78b22 100644
--- a/stacks/step_function/terraform/reports-generator-event-triggers.tf
+++ b/stacks/step_function/terraform/reports-generator-event-triggers.tf
@@ -1,4 +1,6 @@
 resource "aws_cloudwatch_event_target" "monthly_transfer_outcomes_per_supplier_pathway_report_event_trigger" {
+  count = var.environment == "dev" ? 0 : 1
+
   target_id = "${var.environment}-monthly-reports-generator-transfer-outcomes-trigger"
   rule      = aws_cloudwatch_event_rule.run_once_a_month_on_15th_cron_expression.name
   arn       = aws_sfn_state_machine.reports_generator.arn
@@ -13,6 +15,8 @@ resource "aws_cloudwatch_event_target" "monthly_transfer_outcomes_per_supplier_p
 }
 
 resource "aws_cloudwatch_event_target" "monthly_sicbl_level_integration_times_report_event_trigger" {
+  count = var.environment == "dev" ? 0 : 1
+
   target_id = "${var.environment}-monthly-reports-generator-sicbl-level-integr-trigger"
   rule      = aws_cloudwatch_event_rule.run_once_a_month_on_15th_cron_expression.name
   arn       = aws_sfn_state_machine.reports_generator.arn
@@ -27,6 +31,8 @@ resource "aws_cloudwatch_event_target" "monthly_sicbl_level_integration_times_re
 }
 
 resource "aws_cloudwatch_event_target" "weekly_transfer_outcomes_per_supplier_pathway_report_event_trigger" {
+  count = var.environment == "dev" ? 0 : 1
+
   target_id = "${var.environment}-weekly-reports-generator-transfer-outcomes-trigger"
   rule      = aws_cloudwatch_event_rule.run_once_a_week_on_monday_cron_expression.name
   arn       = aws_sfn_state_machine.reports_generator.arn
@@ -41,6 +47,8 @@ resource "aws_cloudwatch_event_target" "weekly_transfer_outcomes_per_supplier_pa
 }
 
 resource "aws_cloudwatch_event_target" "weekly_transfer_level_technical_failures_report_event_trigger" {
+  count = var.environment == "dev" ? 0 : 1
+
   target_id = "${var.environment}-weekly-reports-generator-transfer-level-trigger"
   rule      = aws_cloudwatch_event_rule.run_once_a_week_on_monday_cron_expression.name
   arn       = aws_sfn_state_machine.reports_generator.arn
@@ -55,6 +63,8 @@ resource "aws_cloudwatch_event_target" "weekly_transfer_level_technical_failures
 }
 
 resource "aws_cloudwatch_event_target" "weekly_transfer_details_by_hour_report_event_trigger" {
+  count = var.environment == "dev" ? 0 : 1
+
   target_id = "${var.environment}-weekly-reports-generator-transfer-hourly-trigger"
   rule      = aws_cloudwatch_event_rule.run_once_a_week_on_monday_cron_expression.name
   arn       = aws_sfn_state_machine.reports_generator.arn
@@ -69,6 +79,8 @@ resource "aws_cloudwatch_event_target" "weekly_transfer_details_by_hour_report_e
 }
 
 resource "aws_cloudwatch_event_target" "daily_transfer_outcomes_per_supplier_pathway_report_event_trigger" {
+  count = var.environment == "dev" ? 0 : 1
+
   target_id = "${var.environment}-daily-reports-generator-transfer-outcomes-trigger"
   rule      = aws_cloudwatch_event_rule.run_daily_7am_cron_expression.name
   arn       = aws_sfn_state_machine.reports_generator.arn
@@ -83,6 +95,8 @@ resource "aws_cloudwatch_event_target" "daily_transfer_outcomes_per_supplier_pat
 }
 
 resource "aws_cloudwatch_event_target" "daily_transfer_level_technical_failures_report_event_trigger" {
+  count = var.environment == "dev" ? 0 : 1
+
   target_id = "${var.environment}-daily-reports-transfer-level-technical-failures-trigger"
   rule      = aws_cloudwatch_event_rule.run_daily_7am_cron_expression.name
   arn       = aws_sfn_state_machine.reports_generator.arn
@@ -97,6 +111,8 @@ resource "aws_cloudwatch_event_target" "daily_transfer_level_technical_failures_
 }
 
 resource "aws_cloudwatch_event_target" "daily_transfer_details_by_hour_report_event_trigger" {
+  count = var.environment == "dev" ? 0 : 1
+
   target_id = "${var.environment}-daily-reports-details-by-hour-trigger"
   rule      = aws_cloudwatch_event_rule.run_daily_7am_cron_expression.name
   arn       = aws_sfn_state_machine.reports_generator.arn
@@ -108,4 +124,4 @@ resource "aws_cloudwatch_event_target" "daily_transfer_details_by_hour_report_ev
     "ALERT_ENABLED" : "false",
     "SEND_EMAIL_NOTIFICATION" : "true"
   })
-}
\ No newline at end of file
+}