diff --git a/infrastructure/stacks/blue-green-link/cloudwatch-queries.tf b/infrastructure/stacks/blue-green-link/cloudwatch-queries.tf
index cf69c59cc..9e88fe56e 100644
--- a/infrastructure/stacks/blue-green-link/cloudwatch-queries.tf
+++ b/infrastructure/stacks/blue-green-link/cloudwatch-queries.tf
@@ -4,7 +4,7 @@
 // of the query definitions themselves, but can reduce immediate read
 // failures when the provider plans many resources concurrently.
 resource "time_sleep" "wait_for_propagation" {
-  create_duration = "5s"
+  create_duration = "45s"
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_errors" {
@@ -33,7 +33,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_correlation_id" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_for_errors]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-correlation-id"
 
   log_group_names = [
@@ -58,7 +58,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_correlation_id_expanded" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_correlation_id]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-correlation-id-expanded"
 
   log_group_names = [
@@ -83,7 +83,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_odscode" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_correlation_id_expanded]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-odscode"
 
   log_group_names = [
@@ -108,7 +108,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_odscode_expanded" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_odscode]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-odscode-expanded"
 
   log_group_names = [
@@ -133,7 +133,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_invalid_postcode" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_odscode_expanded]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-invalid-postcode"
 
   log_group_names = [
@@ -152,7 +152,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_invalid_opening_times" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_for_invalid_postcode]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-invalid-opening-times"
 
   log_group_names = [
@@ -171,7 +171,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_email_correlation_id" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_for_invalid_opening_times]
   name = "${var.project_id}/${var.blue_green_environment}/search-by-email-correlation-id"
 
   log_group_names = [
@@ -191,7 +191,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_update_request_success" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_email_correlation_id]
   name = "${var.project_id}/${var.blue_green_environment}/update-request-success"
 
   log_group_names = [
@@ -210,7 +210,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_update_request_failed" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_update_request_success]
   name = "${var.project_id}/${var.blue_green_environment}/update-request-failed"
 
   log_group_names = [
@@ -229,7 +229,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_by_dos_data_item_updates" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_update_request_failed]
   name = "${var.project_id}/${var.blue_green_environment}/dos-data-item-updates"
 
   log_group_names = [
@@ -250,7 +250,7 @@ EOF
 }
 
 resource "aws_cloudwatch_query_definition" "search_for_report_warnings" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_by_dos_data_item_updates]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-report-warnings"
 
   log_group_names = [
@@ -277,7 +277,7 @@ EOF
 
 
 resource "aws_cloudwatch_query_definition" "search_for_quality_checker_logs_with_odscode" {
-  depends_on = [time_sleep.wait_for_propagation]
+  depends_on = [aws_cloudwatch_query_definition.search_for_report_warnings]
   name = "${var.project_id}/${var.blue_green_environment}/search-for-quality-checker-logs-with-odscode"
 
   log_group_names = [