diff --git a/.github/workflows/infrastructure_version.txt b/.github/workflows/infrastructure_version.txt
index 0c7f0553a..bd72db708 100644
--- a/.github/workflows/infrastructure_version.txt
+++ b/.github/workflows/infrastructure_version.txt
@@ -1 +1 @@
-2.17.27
+2.17.29
diff --git a/aws/eks/cloudwatch_log.tf b/aws/eks/cloudwatch_log.tf
index f550223fd..08b72c95a 100644
--- a/aws/eks/cloudwatch_log.tf
+++ b/aws/eks/cloudwatch_log.tf
@@ -2,11 +2,6 @@
 # AWS EKS Cloudwatch groups
 ###
 
-import {
-  to = aws_cloudwatch_log_group.blazer[0]
-  id = "blazer"
-}
-
 resource "aws_cloudwatch_log_group" "notification-canada-ca-eks-cluster-logs" {
   count             = var.cloudwatch_enabled ? 1 : 0
   name              = "/aws/eks/${var.eks_cluster_name}/cluster"
diff --git a/env/dev/manifest_secrets/.terraform.lock.hcl b/env/dev/manifest_secrets/.terraform.lock.hcl
new file mode 100644
index 000000000..65a94f9cd
--- /dev/null
+++ b/env/dev/manifest_secrets/.terraform.lock.hcl
@@ -0,0 +1,94 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/hashicorp/aws" {
+  version     = "5.75.1"
+  constraints = "~> 5.66"
+  hashes = [
+    "h1:fr252BPFVqsCcVoLMN4PTVacXmrW3pbMlK1ibi/wHiU=",
+    "zh:1075825e7311a8d2d233fd453a173910e891b0320e8a7698af44d1f90b02621d",
+    "zh:203c5d09a03fcaa946defb8459f01227f2fcda07df768f74777beb328d6751ae",
+    "zh:21bc79ccb09bfdeb711a3a5226c6c4a457ac7c4bb781dbda6ade7be38461739f",
+    "zh:2bac969855b62a0ff6716954be29387a1f9793626059122cda4681206396e309",
+    "zh:4b65ea5b51058f05b9ec8797f76184e19e5b38a609029fe2226af3fa4ad289b3",
+    "zh:5065d7df357fb3ee2b0a2520bbcff6335c0c47bfb9e8e9932bad088c3ab7efd3",
+    "zh:678a4015a4cd26af5c2b30dfd9290b8a01e900668fa0fec6585dfd1838f1cebd",
+    "zh:6ddc5dfdd4a0dddca027db99a7bfa9a0978933119d63af81acb6020728405119",
+    "zh:98c0d48b09842c444dbcbddd279e5b5b1e44113951817a8ecc28896bb4ad1dd7",
+    "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
+    "zh:aad169fea072842c0b54f1ff95f1ec6558d6c5af3ea4c159308583db59003b09",
+    "zh:bd2625ed8e1ff29ac6ed3a810d7b68a090add5fcb2fce4122669bd37e1eb9f1d",
+    "zh:c6f57625e26a6ef1ffb49bfa0e6148496ad12d80c857f6bb222e21f293a2a78a",
+    "zh:c7cd085326c5eb88804b11a4bc0fbc8376f06138f4b9624fb25cd06ea8687cdd",
+    "zh:f60c98139f983817d4d08f4138b1e53f31f91176ff638631e8dd38b6de36fce0",
+  ]
+}
+
+provider "registry.terraform.io/hashicorp/tls" {
+  version     = "4.0.6"
+  constraints = "~> 4.0"
+  hashes = [
+    "h1:/sSdjHoiykrPdyBP1JE03V/KDgLXnHZhHcSOYIdDH/A=",
+    "zh:10de0d8af02f2e578101688fd334da3849f56ea91b0d9bd5b1f7a243417fdda8",
+    "zh:37fc01f8b2bc9d5b055dc3e78bfd1beb7c42cfb776a4c81106e19c8911366297",
+    "zh:4578ca03d1dd0b7f572d96bd03f744be24c726bfd282173d54b100fd221608bb",
+    "zh:6c475491d1250050765a91a493ef330adc24689e8837a0f07da5a0e1269e11c1",
+    "zh:81bde94d53cdababa5b376bbc6947668be4c45ab655de7aa2e8e4736dfd52509",
+    "zh:abdce260840b7b050c4e401d4f75c7a199fafe58a8b213947a258f75ac18b3e8",
+    "zh:b754cebfc5184873840f16a642a7c9ef78c34dc246a8ae29e056c79939963c7a",
+    "zh:c928b66086078f9917aef0eec15982f2e337914c5c4dbc31dd4741403db7eb18",
+    "zh:cded27bee5f24de6f2ee0cfd1df46a7f88e84aaffc2ecbf3ff7094160f193d50",
+    "zh:d65eb3867e8f69aaf1b8bb53bd637c99c6b649ba3db16ded50fa9a01076d1a27",
+    "zh:ecb0c8b528c7a619fa71852bb3fb5c151d47576c5aab2bf3af4db52588722eeb",
+    "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
+  ]
+}
+
+provider "registry.terraform.io/integrations/github" {
+  version     = "6.4.0"
+  constraints = "~> 6.0"
+  hashes = [
+    "h1:B1q5+Ub1G3zJa9y474Fg40eo/N04/vOSeaf3dWaCG0I=",
+    "zh:00f431c2a2510efcb1115442dda5e90815bcb16e1a3301679ade0139fa963d3b",
+    "zh:12a862f4317b3cb65682c1b687650cd91eeee99e63774bdcfa8bcfc64bad097b",
+    "zh:226d5e09ff27f94cb9336089181d26f85cb30219b863a579597f2e107f37de49",
+    "zh:402ecaa5add568a52ee01d816810f3b90f693be35c680fcdc9b6284bf55326f1",
+    "zh:60e3bdd9fbefb3c1d790bc08889c1dc0e83636b82284faaa709411aa4f96bb9f",
+    "zh:625099eeff2f8aaecd22a24a451b326828435c8f9de86f2e5e99872e7b467fa7",
+    "zh:79e8b665421009df2260f50e10da1f7a7863b557ece96e2b07dfd2fad1e86fcd",
+    "zh:98e471fefc93dcfedeec750c694110db7d3331dc3a256191d30b9d2f70d12157",
+    "zh:a17702765e1fa92d1c288ddfd97075819ad61b344b341be7e09c554c841a6d9e",
+    "zh:ca72ccf40624ae26bf4660d8dd84a51638f0a1e78d5f19fdfaafaef97f838af6",
+    "zh:d009ab5527d45c44c424d26cd2eb51a5a6a6448f3fb1023b675789588cc08d64",
+    "zh:e5811be1e942a75b14dfcd3e03523d8df60cfbde0d7e24d75e78480a02a58949",
+    "zh:e6008ad28225ad6996b06bcd7f3070863329df406a56754e7fb9c31d6301ace4",
+    "zh:f1d93f56ea4f87183a5de4780704907605851d95a2d285a9ec755bf784c5569c",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}
+
+provider "registry.terraform.io/newrelic/newrelic" {
+  version     = "3.52.1"
+  constraints = "~> 3.3"
+  hashes = [
+    "h1:Y6bcpmTzjIhfNsm2quEjHN+BcR/8cABqYNkav7PltVs=",
+    "zh:07c0beb3979ed390db5e90a48b0b5971910c59282e6e2a66ea5815a54404bc66",
+    "zh:1f9083fed84147da5c911380c1c2ebd5cb5f2f894b5e5cda8a3abd1777752cd6",
+    "zh:2997e865edcd375c42c4188e793bd61cc4b47f166aec14ae39c29b753aab3232",
+    "zh:34f66ea44f1fa4e0796326082d7c2b5b72b656ec9b7e9686d4dc0e29fd248c57",
+    "zh:419d0163f21579484bc0346bf877316044fcd690ce6d395637dc97a928c82b46",
+    "zh:4894482a76be74544a585fa3ef4b5f7ce740b0755be38a5bd6385632aab1fce3",
+    "zh:6a31e950c428effe98b0098330bdaa735750eb5a564d95e3c8d1218308cf9fd0",
+    "zh:6d758e1a0789ec81a8be42b82dc33b8124b9fe954d38c051d693f97a15221825",
+    "zh:6e0f2fccc94ff06cc41873b55815ea94582c5a269ee2940108a9bfef570720c8",
+    "zh:740c87cb61e99081778dd14e4fcb30067b315b7c7ac6c0a01103dd45952b3746",
+    "zh:84bbe558941bb1052122778f14f8d13215f43cfeb9896f3ded32ece747cd65a2",
+    "zh:9754d4095bb81055358e49f2ec67c269b4f29bdf5ec6a12b9062447022833c80",
+    "zh:cf7452adb70a8317bb5357a1ebf181aba1fecf6e7bdac261d63dcd3b3b62846d",
+    "zh:d7699d74de72fb65cdd2ea9df5aece0c2550ce5aea8380de889dd4116e050d6a",
+    "zh:e6063316833ee97ce54135cf974f3c488058ce2ef0870378191785a49d7805df",
+    "zh:ee7273ef82e3ffdbd2f219145c3d5fe8e2d1bb8e3a4f549988147802312b1123",
+    "zh:f66b6283322ce091651fc7800a8c7311d96d8964f80376f6a8019b263dee261e",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}
diff --git a/env/dev/system_status_static_site/.terraform.lock.hcl b/env/dev/system_status_static_site/.terraform.lock.hcl
index 2e3984186..8193cb859 100644
--- a/env/dev/system_status_static_site/.terraform.lock.hcl
+++ b/env/dev/system_status_static_site/.terraform.lock.hcl
@@ -63,6 +63,29 @@ provider "registry.terraform.io/hashicorp/tls" {
   ]
 }
 
+provider "registry.terraform.io/integrations/github" {
+  version     = "6.4.0"
+  constraints = "~> 6.0"
+  hashes = [
+    "h1:B1q5+Ub1G3zJa9y474Fg40eo/N04/vOSeaf3dWaCG0I=",
+    "zh:00f431c2a2510efcb1115442dda5e90815bcb16e1a3301679ade0139fa963d3b",
+    "zh:12a862f4317b3cb65682c1b687650cd91eeee99e63774bdcfa8bcfc64bad097b",
+    "zh:226d5e09ff27f94cb9336089181d26f85cb30219b863a579597f2e107f37de49",
+    "zh:402ecaa5add568a52ee01d816810f3b90f693be35c680fcdc9b6284bf55326f1",
+    "zh:60e3bdd9fbefb3c1d790bc08889c1dc0e83636b82284faaa709411aa4f96bb9f",
+    "zh:625099eeff2f8aaecd22a24a451b326828435c8f9de86f2e5e99872e7b467fa7",
+    "zh:79e8b665421009df2260f50e10da1f7a7863b557ece96e2b07dfd2fad1e86fcd",
+    "zh:98e471fefc93dcfedeec750c694110db7d3331dc3a256191d30b9d2f70d12157",
+    "zh:a17702765e1fa92d1c288ddfd97075819ad61b344b341be7e09c554c841a6d9e",
+    "zh:ca72ccf40624ae26bf4660d8dd84a51638f0a1e78d5f19fdfaafaef97f838af6",
+    "zh:d009ab5527d45c44c424d26cd2eb51a5a6a6448f3fb1023b675789588cc08d64",
+    "zh:e5811be1e942a75b14dfcd3e03523d8df60cfbde0d7e24d75e78480a02a58949",
+    "zh:e6008ad28225ad6996b06bcd7f3070863329df406a56754e7fb9c31d6301ace4",
+    "zh:f1d93f56ea4f87183a5de4780704907605851d95a2d285a9ec755bf784c5569c",
+    "zh:fbd1fee2c9df3aa19cf8851ce134dea6e45ea01cb85695c1726670c285797e25",
+  ]
+}
+
 provider "registry.terraform.io/newrelic/newrelic" {
   version     = "3.48.0"
   constraints = "~> 3.3"
diff --git a/env/variables.tf b/env/variables.tf
index e822e6c1d..d2d14fa73 100644
--- a/env/variables.tf
+++ b/env/variables.tf
@@ -489,11 +489,6 @@ variable "auth_tokens" {
   sensitive = true
 }
 
-variable "dangerous_salt" {
-  type      = string
-  sensitive = true
-}
-
 variable "ff_batch_insertion" {
   type = string
 }
@@ -506,15 +501,6 @@ variable "ff_redis_batch_saving" {
   type = string
 }
 
-variable "redis_url" {
-  type = string
-}
-
-variable "secret_key" {
-  type      = string
-  sensitive = true
-}
-
 variable "notify_sending_domain" {
   type = string
 }
diff --git a/scripts/deleteEnvironment.sh b/scripts/deleteEnvironment.sh
index 77738dd25..228afcb21 100755
--- a/scripts/deleteEnvironment.sh
+++ b/scripts/deleteEnvironment.sh
@@ -96,13 +96,14 @@ aws kms delete-alias --alias-name alias/s3_scan_object_queue
 
 aws iam delete-service-linked-role --role-name AWSServiceRoleForEC2Spot
 
-aws logs delete-query-definition --query-definition-id $(aws logs describe-query-definitions --query 'queryDefinitions[?name==`Lambda Statistics / heartbeat`]'.queryDefinitionId --output text)
-aws logs delete-query-definition --query-definition-id $(aws logs describe-query-definitions --query 'queryDefinitions[?name==`Lambda Statistics - pinpoint_to_sqs_sms_callbacks`]'.queryDefinitionId --output text)
-aws logs delete-query-definition --query-definition-id $(aws logs describe-query-definitions --query 'queryDefinitions[?name==`Lambda Statistics - sns_to_sqs_sms_callbacks`]'.queryDefinitionId --output text)
-aws logs delete-query-definition --query-definition-id $(aws logs describe-query-definitions --query 'queryDefinitions[?name==`Lambda Statistics / system_status`]'.queryDefinitionId --output text)
-aws logs delete-query-definition --query-definition-id $(aws logs describe-query-definitions --query 'queryDefinitions[?name==`Lambda Statistics - ses_to_sqs_email_callbacks`]'.queryDefinitionId --output text)
-aws logs delete-query-definition --query-definition-id $(aws logs describe-query-definitions --query 'queryDefinitions[?name==`Lambda Statistics - ses_receiving_emails`]'.queryDefinitionId --output text --region us-east-1) --region us-east-1
-aws logs delete-query-definition --query-definition-id $(aws logs describe-query-definitions --query 'queryDefinitions[?name==`API / Services going over daily rate limits`]'.queryDefinitionId --output text)
+aws logs delete-log-group --log-group-name '/aws/eks/notification-canada-ca-dev-eks-cluster/cluster'
+aws logs delete-log-group --log-group-name '/aws/rds/cluster/notification-canada-ca-dev-cluster/postgresql'
+
+QUERIES=$(aws logs describe-query-definitions --query 'queryDefinitions[].queryDefinitionId' --output text)
+for query in $QUERIES; do
+  echo "Deleting cloudwatch query $query"
+  aws logs delete-query-definition --query-definition-id $query
+done
 
 aws iam delete-saml-provider --saml-provider-arn arn:aws:iam::$ACCOUNT_ID:saml-provider/client-vpn
 
@@ -138,5 +139,11 @@ for identity in $US_IDENTITIES; do
   echo "Done."
 done
 
+QUERIES=$(aws logs describe-query-definitions --query 'queryDefinitions[].queryDefinitionId' --output text)
+for query in $QUERIES; do
+  echo "Deleting cloudwatch query $query"
+  aws logs delete-query-definition --query-definition-id $query
+done
+
 echo "Done."
-echo "Account $ACCOUNT_ID has been cleaned up."
\ No newline at end of file
+echo "Account $ACCOUNT_ID has been cleaned up."