diff --git a/terraform/environments/cdpt-chaps/bastion_linux.tf b/terraform/environments/cdpt-chaps/bastion_linux.tf
index c82d98192f5..ea35f6e108b 100644
--- a/terraform/environments/cdpt-chaps/bastion_linux.tf
+++ b/terraform/environments/cdpt-chaps/bastion_linux.tf
@@ -11,7 +11,7 @@ module "bastion_linux" {
   }
 
   # s3 - used for logs and user ssh public keys
-  bucket_name          = "bastion"
+  bucket_name = "bastion"
   # public keys
   public_key_data = local.public_key_data.keys[local.environment]
   # logs
diff --git a/terraform/environments/cdpt-ifs/bastion_linux.tf b/terraform/environments/cdpt-ifs/bastion_linux.tf
index 440e54461bb..96ef6a313f3 100644
--- a/terraform/environments/cdpt-ifs/bastion_linux.tf
+++ b/terraform/environments/cdpt-ifs/bastion_linux.tf
@@ -11,7 +11,7 @@ module "bastion_linux" {
   }
 
   # s3 - used for logs and user ssh public keys
-  bucket_name          = "bastion"
+  bucket_name = "bastion"
 
   # public keys
   public_key_data = local.public_key_data.keys[local.environment]
diff --git a/terraform/environments/corporate-staff-rostering/locals_preproduction.tf b/terraform/environments/corporate-staff-rostering/locals_preproduction.tf
index 4ecb5058b95..2e1466c48d3 100644
--- a/terraform/environments/corporate-staff-rostering/locals_preproduction.tf
+++ b/terraform/environments/corporate-staff-rostering/locals_preproduction.tf
@@ -122,11 +122,11 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 56 }
         }
         tags = {
-          pre-migration     = "PPCAW00013"
-          description       = "Application Server Region 1"
-          os-type           = "Windows"
-          ami               = "pp-csr-a-13-a"
-          component         = "app"
+          pre-migration = "PPCAW00013"
+          description   = "Application Server Region 1"
+          os-type       = "Windows"
+          ami           = "pp-csr-a-13-a"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -149,11 +149,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 56 }
         }
         tags = {
-          pre-migration     = "PPCAW00014"
-          description       = "Application Server Region 2"
-          os-type           = "Windows"
-          ami               = "pp-csr-a-14-b"
-          component         = "app"
+          pre-migration = "PPCAW00014"
+          description   = "Application Server Region 2"
+          os-type       = "Windows"
+          ami           = "pp-csr-a-14-b"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -176,11 +176,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 128 }
         }
         tags = {
-          pre-migration     = "PPCAW00017"
-          description       = "Application Server Region 3"
-          os-type           = "Windows"
-          ami               = "pp-csr-a-17-a"
-          component         = "app"
+          pre-migration = "PPCAW00017"
+          description   = "Application Server Region 3"
+          os-type       = "Windows"
+          ami           = "pp-csr-a-17-a"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -203,11 +203,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 128 }
         }
         tags = {
-          pre-migration     = "PPCAW00018"
-          description       = "Application Server Region 4"
-          os-type           = "Windows"
-          ami               = "pp-csr-a-18-b"
-          component         = "app"
+          pre-migration = "PPCAW00018"
+          description   = "Application Server Region 4"
+          os-type       = "Windows"
+          ami           = "pp-csr-a-18-b"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -228,11 +228,11 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 56 }
         }
         tags = {
-          pre-migration     = "PPCAW00002"
-          description       = "Application Server Region 5"
-          os-type           = "Windows"
-          ami               = "pp-csr-a-2-b"
-          component         = "app"
+          pre-migration = "PPCAW00002"
+          description   = "Application Server Region 5"
+          os-type       = "Windows"
+          ami           = "pp-csr-a-2-b"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -253,11 +253,11 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 56 }
         }
         tags = {
-          pre-migration     = "PPCAW00003"
-          description       = "Application Server Region 6"
-          os-type           = "Windows"
-          ami               = "pp-csr-a-3-a"
-          component         = "app"
+          pre-migration = "PPCAW00003"
+          description   = "Application Server Region 6"
+          os-type       = "Windows"
+          ami           = "pp-csr-a-3-a"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -280,11 +280,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 128 }
         }
         tags = {
-          pre-migration     = "PPCAW00015"
-          description       = "Application Server Training A"
-          os-type           = "Windows"
-          ami               = "pp-csr-a-15-a"
-          component         = "trainingA"
+          pre-migration = "PPCAW00015"
+          description   = "Application Server Training A"
+          os-type       = "Windows"
+          ami           = "pp-csr-a-15-a"
+          component     = "trainingA"
         }
         route53_records = {
           create_internal_record = true
@@ -307,11 +307,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 128 }
         }
         tags = {
-          pre-migration     = "PPCAW00016"
-          description       = "Application Server Training B"
-          os-type           = "Windows"
-          ami               = "pp-csr-a-16-b"
-          component         = "trainingB"
+          pre-migration = "PPCAW00016"
+          description   = "Application Server Training B"
+          os-type       = "Windows"
+          ami           = "pp-csr-a-16-b"
+          component     = "trainingB"
         }
         route53_records = {
           create_internal_record = true
@@ -334,11 +334,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 129 }
         }
         tags = {
-          pre-migration     = "PPCWW00001"
-          description       = "Web Server Region 1 and 2"
-          os-type           = "Windows"
-          ami               = "PPCWW00001"
-          component         = "web"
+          pre-migration = "PPCWW00001"
+          description   = "Web Server Region 1 and 2"
+          os-type       = "Windows"
+          ami           = "PPCWW00001"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -361,11 +361,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 129 }
         }
         tags = {
-          pre-migration     = "PPCWW00002"
-          description       = "Web Server Region 1 and 2"
-          os-type           = "Windows"
-          ami               = "pp-csr-w-2-b"
-          component         = "web"
+          pre-migration = "PPCWW00002"
+          description   = "Web Server Region 1 and 2"
+          os-type       = "Windows"
+          ami           = "pp-csr-w-2-b"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -387,11 +387,11 @@ locals {
           "/dev/sdc"  = { type = "gp3", size = 129 }
         }
         tags = {
-          pre-migration     = "PPCWW00005"
-          description       = "Web Server Region 3 and 4"
-          os-type           = "Windows"
-          ami               = "PPCWW00005"
-          component         = "web"
+          pre-migration = "PPCWW00005"
+          description   = "Web Server Region 3 and 4"
+          os-type       = "Windows"
+          ami           = "PPCWW00005"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -414,11 +414,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 129 }
         }
         tags = {
-          pre-migration     = "PPCWW00006"
-          description       = "Web Server Region 3 and 4"
-          os-type           = "Windows"
-          ami               = "pp-csr-w-6-b"
-          component         = "web"
+          pre-migration = "PPCWW00006"
+          description   = "Web Server Region 3 and 4"
+          os-type       = "Windows"
+          ami           = "pp-csr-w-6-b"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -439,11 +439,11 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 56 }
         }
         tags = {
-          pre-migration     = "PPCWW00007"
-          description       = "Web Server Region 5 and 6"
-          os-type           = "Windows"
-          ami               = "pp-csr-w-8-b" # rebuilt using pp-csr-w-8-b AMI
-          component         = "web"
+          pre-migration = "PPCWW00007"
+          description   = "Web Server Region 5 and 6"
+          os-type       = "Windows"
+          ami           = "pp-csr-w-8-b" # rebuilt using pp-csr-w-8-b AMI
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -464,11 +464,11 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 56 }
         }
         tags = {
-          pre-migration     = "PPCWW00008"
-          description       = "Web Server Region 5 and 6"
-          os-type           = "Windows"
-          ami               = "pp-csr-w-8-b"
-          component         = "web"
+          pre-migration = "PPCWW00008"
+          description   = "Web Server Region 5 and 6"
+          os-type       = "Windows"
+          ami           = "pp-csr-w-8-b"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -491,11 +491,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 56 }
         }
         tags = {
-          pre-migration     = "PPCWW00003"
-          description       = "Web Server Training A and B"
-          os-type           = "Windows"
-          ami               = "pp-csr-w-3-a"
-          component         = "trainingab"
+          pre-migration = "PPCWW00003"
+          description   = "Web Server Training A and B"
+          os-type       = "Windows"
+          ami           = "pp-csr-w-3-a"
+          component     = "trainingab"
         }
         route53_records = {
           create_internal_record = true
@@ -518,18 +518,18 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 129 }
         }
         tags = {
-          pre-migration     = "PPCWW00004"
-          description       = "Web Server Training A and B"
-          os-type           = "Windows"
-          ami               = "pp-csr-w-4-b"
-          component         = "trainingab"
+          pre-migration = "PPCWW00004"
+          description   = "Web Server Training A and B"
+          os-type       = "Windows"
+          ami           = "pp-csr-w-4-b"
+          component     = "trainingab"
         }
         route53_records = {
           create_internal_record = true
           create_external_record = true
         }
       })
-  }
+    }
 
 
     baseline_lbs = {
diff --git a/terraform/environments/corporate-staff-rostering/locals_production.tf b/terraform/environments/corporate-staff-rostering/locals_production.tf
index aed7ab7ac5b..de6501598fa 100644
--- a/terraform/environments/corporate-staff-rostering/locals_production.tf
+++ b/terraform/environments/corporate-staff-rostering/locals_production.tf
@@ -160,11 +160,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 112 }
         }
         tags = {
-          pre-migration     = "PDCAW00007"
-          description       = "Application Server Region 1"
-          os-type           = "Windows"
-          ami               = "pd-csr-a-7-a"
-          component         = "app"
+          pre-migration = "PDCAW00007"
+          description   = "Application Server Region 1"
+          os-type       = "Windows"
+          ami           = "pd-csr-a-7-a"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -187,11 +187,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 112 }
         }
         tags = {
-          pre-migration     = "PDCAW00008"
-          description       = "Application Server Region 2"
-          os-type           = "Windows"
-          ami               = "pd-csr-a-8-b"
-          component         = "app"
+          pre-migration = "PDCAW00008"
+          description   = "Application Server Region 2"
+          os-type       = "Windows"
+          ami           = "pd-csr-a-8-b"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -214,11 +214,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 128 }
         }
         tags = {
-          pre-migration     = "PDCAW00009"
-          description       = "Application Server Region 3"
-          os-type           = "Windows"
-          ami               = "pd-csr-a-9-a"
-          component         = "app"
+          pre-migration = "PDCAW00009"
+          description   = "Application Server Region 3"
+          os-type       = "Windows"
+          ami           = "pd-csr-a-9-a"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -241,11 +241,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 112 }
         }
         tags = {
-          pre-migration     = "PDCAW00010"
-          description       = "Application Server Region 4"
-          os-type           = "Windows"
-          ami               = "pd-csr-a-10-b"
-          component         = "app"
+          pre-migration = "PDCAW00010"
+          description   = "Application Server Region 4"
+          os-type       = "Windows"
+          ami           = "pd-csr-a-10-b"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -268,11 +268,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 128 }
         }
         tags = {
-          pre-migration     = "PDCAW00011"
-          description       = "Application Server Region 5"
-          os-type           = "Windows"
-          ami               = "pd-csr-a-11-a"
-          component         = "app"
+          pre-migration = "PDCAW00011"
+          description   = "Application Server Region 5"
+          os-type       = "Windows"
+          ami           = "pd-csr-a-11-a"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -294,11 +294,11 @@ locals {
           "/dev/sdc"  = { type = "gp3", size = 112 }
         }
         tags = {
-          pre-migration     = "PDCAW00012"
-          description       = "Application Server Region 6"
-          os-type           = "Windows"
-          ami               = "pd-csr-a-12-b"
-          component         = "app"
+          pre-migration = "PDCAW00012"
+          description   = "Application Server Region 6"
+          os-type       = "Windows"
+          ami           = "pd-csr-a-12-b"
+          component     = "app"
         }
         route53_records = {
           create_internal_record = true
@@ -321,11 +321,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 112 }
         }
         tags = {
-          pre-migration     = "PDCWW00001"
-          description       = "Web Server Region 1 and 2"
-          os-type           = "Windows"
-          ami               = "pd-csr-w-1-a"
-          component         = "web"
+          pre-migration = "PDCWW00001"
+          description   = "Web Server Region 1 and 2"
+          os-type       = "Windows"
+          ami           = "pd-csr-w-1-a"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -348,11 +348,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 112 }
         }
         tags = {
-          pre-migration     = "PDCWW00002"
-          description       = "Web Server Region 1 and 2"
-          os-type           = "Windows"
-          ami               = "pd-csr-w-2-b"
-          component         = "web"
+          pre-migration = "PDCWW00002"
+          description   = "Web Server Region 1 and 2"
+          os-type       = "Windows"
+          ami           = "pd-csr-w-2-b"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -375,11 +375,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 128 }
         }
         tags = {
-          pre-migration     = "PDCWW00003"
-          description       = "Web Server Region 3 and 4"
-          os-type           = "Windows"
-          ami               = "pd-csr-w-3-a"
-          component         = "web"
+          pre-migration = "PDCWW00003"
+          description   = "Web Server Region 3 and 4"
+          os-type       = "Windows"
+          ami           = "pd-csr-w-3-a"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -402,11 +402,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 128 }
         }
         tags = {
-          pre-migration     = "PDCWW00004"
-          description       = "Web Server Region 3 and 4"
-          os-type           = "Windows"
-          ami               = "pd-csr-w-4-b"
-          component         = "web"
+          pre-migration = "PDCWW00004"
+          description   = "Web Server Region 3 and 4"
+          os-type       = "Windows"
+          ami           = "pd-csr-w-4-b"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -429,11 +429,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 128 }
         }
         tags = {
-          pre-migration     = "PDCWW00005"
-          description       = "Web Server Region 5 and 6"
-          os-type           = "Windows"
-          ami               = "pd-csr-w-5-a"
-          component         = "web"
+          pre-migration = "PDCWW00005"
+          description   = "Web Server Region 5 and 6"
+          os-type       = "Windows"
+          ami           = "pd-csr-w-5-a"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
@@ -456,11 +456,11 @@ locals {
           "/dev/sdd"  = { type = "gp3", size = 112 }
         }
         tags = {
-          pre-migration     = "PDCWW00006"
-          description       = "Web Server Region 5 and 6"
-          os-type           = "Windows"
-          ami               = "pd-csr-w-6-b"
-          component         = "web"
+          pre-migration = "PDCWW00006"
+          description   = "Web Server Region 5 and 6"
+          os-type       = "Windows"
+          ami           = "pd-csr-w-6-b"
+          component     = "web"
         }
         route53_records = {
           create_internal_record = true
diff --git a/terraform/environments/delius-jitbit/application_variables.json b/terraform/environments/delius-jitbit/application_variables.json
index 9b7db327b1c..1fd6a1df4b0 100644
--- a/terraform/environments/delius-jitbit/application_variables.json
+++ b/terraform/environments/delius-jitbit/application_variables.json
@@ -1,6 +1,6 @@
 {
   "accounts": {
-    "sandbox" : {
+    "sandbox": {
       "migration_source_account_id": "377957503799",
       "migration_source_account_name": "cr-jitbit-dev",
       "server_port": "5000",
diff --git a/terraform/environments/delius-jitbit/locals.tf b/terraform/environments/delius-jitbit/locals.tf
index df0b0719c95..486be827091 100644
--- a/terraform/environments/delius-jitbit/locals.tf
+++ b/terraform/environments/delius-jitbit/locals.tf
@@ -6,7 +6,7 @@ locals {
   non_prod_app_url = "${var.networking[0].application}.${var.networking[0].business-unit}-${local.environment}.${local.domain}"
   prod_app_url     = "helpdesk.${local.domain}"
   app_url          = local.is-production ? local.prod_app_url : local.non_prod_app_url
-  sandbox_app_url = "${var.networking[0].application}-sandbox.${var.networking[0].business-unit}-${local.environment}.${local.domain}"
+  sandbox_app_url  = "${var.networking[0].application}-sandbox.${var.networking[0].business-unit}-${local.environment}.${local.domain}"
 
   acm_subject_alternative_names = local.is-development ? [local.app_url, local.sandbox_app_url] : [local.app_url]
 
@@ -22,15 +22,15 @@ locals {
     }
   }
 
-  domain_name_main   = [for k, v in local.domain_types : v.name if k == local.domain]
-  domain_name_sub    = [for k, v in local.domain_types : v.name if k == local.app_url]
-  domain_name_sub_sandbox = [for k, v in local.domain_types : v.name if k == local.sandbox_app_url]
-  domain_record_main = [for k, v in local.domain_types : v.record if k == local.domain]
-  domain_record_sub  = [for k, v in local.domain_types : v.record if k == local.app_url]
+  domain_name_main          = [for k, v in local.domain_types : v.name if k == local.domain]
+  domain_name_sub           = [for k, v in local.domain_types : v.name if k == local.app_url]
+  domain_name_sub_sandbox   = [for k, v in local.domain_types : v.name if k == local.sandbox_app_url]
+  domain_record_main        = [for k, v in local.domain_types : v.record if k == local.domain]
+  domain_record_sub         = [for k, v in local.domain_types : v.record if k == local.app_url]
   domain_record_sub_sandbox = [for k, v in local.domain_types : v.record if k == local.sandbox_app_url]
-  domain_type_main   = [for k, v in local.domain_types : v.type if k == local.domain]
-  domain_type_sub    = [for k, v in local.domain_types : v.type if k == local.app_url]
-  domain_type_sub_sandbox = [for k, v in local.domain_types : v.type if k == local.sandbox_app_url]
+  domain_type_main          = [for k, v in local.domain_types : v.type if k == local.domain]
+  domain_type_sub           = [for k, v in local.domain_types : v.type if k == local.app_url]
+  domain_type_sub_sandbox   = [for k, v in local.domain_types : v.type if k == local.sandbox_app_url]
 
   validation_record_fqdns = local.is-development ? [local.domain_name_main[0], local.domain_name_sub[0], local.domain_name_sub_sandbox[0]] : [local.domain_name_main[0], local.domain_name_sub[0]]
 
diff --git a/terraform/environments/delius-jitbit/route53.tf b/terraform/environments/delius-jitbit/route53.tf
index 67179779ea9..7f55335fa83 100644
--- a/terraform/environments/delius-jitbit/route53.tf
+++ b/terraform/environments/delius-jitbit/route53.tf
@@ -87,7 +87,7 @@ resource "aws_route53_record" "external_validation_subdomain" {
 }
 
 resource "aws_route53_record" "external_validation_subdomain_sandbox" {
-  count = local.is-development ? 1 : 0
+  count    = local.is-development ? 1 : 0
   provider = aws.core-vpc
 
   allow_overwrite = true
diff --git a/terraform/environments/delius-jitbit/sandbox_route53.tf b/terraform/environments/delius-jitbit/sandbox_route53.tf
index ed798cf95f0..8b0a05fbbf3 100644
--- a/terraform/environments/delius-jitbit/sandbox_route53.tf
+++ b/terraform/environments/delius-jitbit/sandbox_route53.tf
@@ -1,5 +1,5 @@
 resource "aws_route53_record" "external_sandbox" {
-  count    = local.is-development ? 1 : 0
+  count = local.is-development ? 1 : 0
 
   provider = aws.core-vpc
 
diff --git a/terraform/environments/delius-jitbit/sandbox_s3.tf b/terraform/environments/delius-jitbit/sandbox_s3.tf
index 4f013cca552..a15466cb909 100644
--- a/terraform/environments/delius-jitbit/sandbox_s3.tf
+++ b/terraform/environments/delius-jitbit/sandbox_s3.tf
@@ -1,6 +1,6 @@
 module "jitbit_bucket_sandbox" {
   count = local.is-development ? 1 : 0
-  
+
   source = "github.com/ministryofjustice/modernisation-platform-terraform-s3-bucket?ref=v7.0.0"
 
   providers = {
@@ -87,7 +87,7 @@ module "jitbit_bucket_sandbox" {
 
 resource "aws_s3_bucket_intelligent_tiering_configuration" "jitbit_sandbox" {
   count = local.is-development ? 1 : 0
-  
+
   bucket = module.jitbit_bucket_sandbox[0].bucket.id
   name   = "JitbitBucketTiering"
 
diff --git a/terraform/environments/digital-prison-reporting/application_variables.json b/terraform/environments/digital-prison-reporting/application_variables.json
index 3cf7373eaf7..96109ca7183 100644
--- a/terraform/environments/digital-prison-reporting/application_variables.json
+++ b/terraform/environments/digital-prison-reporting/application_variables.json
@@ -276,7 +276,7 @@
       "setup_sonatype_secrets": false,
       "setup_scheduled_action_iam_role": true,
       "setup_redshift_schedule": true,
-      "dps_domains": ["activities"],      
+      "dps_domains": ["activities"],
       "alarms": {
         "setup_cw_alarms": true,
         "redshift": {
@@ -451,7 +451,7 @@
       "setup_scheduled_action_iam_role": true,
       "setup_redshift_schedule": true,
       "enable_redshift_health_check": true,
-      "dps_domains": ["activities"],      
+      "dps_domains": ["activities"],
       "alarms": {
         "setup_cw_alarms": true,
         "redshift": {
@@ -624,7 +624,7 @@
       "setup_sonatype_secrets": false,
       "setup_scheduled_action_iam_role": false,
       "setup_redshift_schedule": false,
-      "dps_domains": ["activities"],      
+      "dps_domains": ["activities"],
       "alarms": {
         "setup_cw_alarms": true,
         "redshift": {
diff --git a/terraform/environments/digital-prison-reporting/locals.tf b/terraform/environments/digital-prison-reporting/locals.tf
index 2d3b681dddc..c6541029f28 100644
--- a/terraform/environments/digital-prison-reporting/locals.tf
+++ b/terraform/environments/digital-prison-reporting/locals.tf
@@ -292,7 +292,7 @@ locals {
     endpoint = "0.0.0.0"
     port     = "1521"
   }
-  
+
   # DPS Secrets PlaceHolder
   dps_domains_list = local.application_data.accounts[local.environment].dps_domains
   dps_secrets_placeholder = {
@@ -301,7 +301,7 @@ locals {
     user     = "placeholder"
     endpoint = "0.0.0.0"
     port     = "5432"
-  }  
+  }
 
   sonatype_secrets_placeholder = {
     user     = "placeholder"
diff --git a/terraform/environments/digital-prison-reporting/secrets.tf b/terraform/environments/digital-prison-reporting/secrets.tf
index 465134ed442..1617ca89e2a 100644
--- a/terraform/environments/digital-prison-reporting/secrets.tf
+++ b/terraform/environments/digital-prison-reporting/secrets.tf
@@ -28,7 +28,7 @@ resource "aws_secretsmanager_secret_version" "nomis" {
 # PlaceHolder Secrets
 resource "aws_secretsmanager_secret" "dps" {
   for_each = toset(local.dps_domains_list)
-  name = "external/${local.project}-${each.value}-source-secrets"
+  name     = "external/${local.project}-${each.value}-source-secrets"
 
   tags = merge(
     local.all_tags,
diff --git a/terraform/environments/electronic-monitoring-data/server_backups.tf b/terraform/environments/electronic-monitoring-data/server_backups.tf
index 3a4ec61020e..b31852e9015 100644
--- a/terraform/environments/electronic-monitoring-data/server_backups.tf
+++ b/terraform/environments/electronic-monitoring-data/server_backups.tf
@@ -6,7 +6,7 @@ resource "aws_secretsmanager_secret" "db_password" {
 }
 
 resource "aws_secretsmanager_secret_version" "db_password" {
-  secret_id = aws_secretsmanager_secret.db_password.id
+  secret_id     = aws_secretsmanager_secret.db_password.id
   secret_string = random_password.random_password.result
 }
 
@@ -19,7 +19,7 @@ resource "random_password" "random_password" {
 # RDS SQL server 2022 database
 #------------------------------------------------------------------------------
 resource "aws_db_instance" "database_2022" {
-#   count = local.is-production ? 1 : 0
+  #   count = local.is-production ? 1 : 0
 
   identifier    = "database-v2022"
   license_model = "license-included"
@@ -81,7 +81,7 @@ resource "aws_vpc_security_group_ingress_rule" "db_ipv4" {
 resource "aws_db_subnet_group" "db" {
   name       = "db-subnet-group"
   subnet_ids = data.aws_subnets.shared-public.ids
-  
+
   tags = local.tags
 }
 
@@ -143,7 +143,7 @@ data "aws_iam_policy_document" "rds_data_store_access" {
       "s3:GetBucketLocation",
     ]
     resources = [
-        aws_s3_bucket.data_store.arn,
+      aws_s3_bucket.data_store.arn,
     ]
   }
   statement {
@@ -157,7 +157,7 @@ data "aws_iam_policy_document" "rds_data_store_access" {
       "s3:AbortMultipartUpload",
     ]
     resources = [
-        "${aws_s3_bucket.data_store.arn}/*",
+      "${aws_s3_bucket.data_store.arn}/*",
     ]
   }
 }
diff --git a/terraform/environments/oasys/locals_production.tf b/terraform/environments/oasys/locals_production.tf
index 8a12cb748d0..55d77fc3c86 100644
--- a/terraform/environments/oasys/locals_production.tf
+++ b/terraform/environments/oasys/locals_production.tf
@@ -32,9 +32,9 @@ locals {
     # }
 
     baseline_secretsmanager_secrets = {
-      "/oracle/database/PDOASYS"  = local.secretsmanager_secrets_oasys_db
-      "/oracle/database/PROASYS"  = local.secretsmanager_secrets_oasys_db
-      "/oracle/database/TROASYS"  = local.secretsmanager_secrets_oasys_db 
+      "/oracle/database/PDOASYS" = local.secretsmanager_secrets_oasys_db
+      "/oracle/database/PROASYS" = local.secretsmanager_secrets_oasys_db
+      "/oracle/database/TROASYS" = local.secretsmanager_secrets_oasys_db
 
       # "/oracle/database/PDOASREP" = local.secretsmanager_secrets_db
       # "/oracle/database/PDBIPINF" = local.secretsmanager_secrets_bip_db
@@ -259,7 +259,7 @@ locals {
           description                             = "practice and training ${local.application_name} database"
           "${local.application_name}-environment" = "ptctrn"
           #bip-db-name                             = "PDBIPINF"
-          oracle-sids                             = "PROASYS TROASYS TRBIPINF"
+          oracle-sids = "PROASYS TROASYS TRBIPINF"
         })
       })
     }
@@ -270,7 +270,7 @@ locals {
       #     oracle-db-sid                           = "PDOASYS"
       #   })
       # })
-      
+
       # "pd-${local.application_name}-web-ptc-a" = merge(local.webserver_a, {
       #   config = merge(module.baseline_presets.ec2_instance.config.default, {
       #     ssm_parameters_prefix     = "ec2-web-ptc/"
@@ -282,7 +282,7 @@ locals {
       #     oracle-db-sid                           = "PTCOASYS"
       #   })
       # })
-      
+
       # "pd-${local.application_name}-web-trn-a" = merge(local.webserver_a, {
       #   config = merge(module.baseline_presets.ec2_instance.config.default, {
       #     ssm_parameters_prefix     = "ec2-web-trn/"
diff --git a/terraform/environments/planetfm/locals_preproduction.tf b/terraform/environments/planetfm/locals_preproduction.tf
index f43f93cb9bd..8c0a95b6965 100644
--- a/terraform/environments/planetfm/locals_preproduction.tf
+++ b/terraform/environments/planetfm/locals_preproduction.tf
@@ -50,9 +50,9 @@ locals {
           "/dev/sda1" = { type = "gp3", size = 128 } # root volume
         }
         tags = merge(local.defaults_app_ec2.tags, {
-          pre-migration     = "PPFAW0010"
-          description       = "RDS Session Host and CAFM App Server/PFME Licence Server"
-          ami               = "pp-cafm-a-10-b"
+          pre-migration = "PPFAW0010"
+          description   = "RDS Session Host and CAFM App Server/PFME Licence Server"
+          ami           = "pp-cafm-a-10-b"
         })
       })
 
@@ -72,9 +72,9 @@ locals {
           "/dev/sda1" = { type = "gp3", size = 128 } # root volume
         }
         tags = merge(local.defaults_app_ec2.tags, {
-          pre-migration     = "PPFAW011"
-          description       = "RDS session host and app server"
-          ami               = "pp-cafm-a-11-a"
+          pre-migration = "PPFAW011"
+          description   = "RDS session host and app server"
+          ami           = "pp-cafm-a-11-a"
         })
       })
 
@@ -95,9 +95,9 @@ locals {
           "/dev/sda1" = { type = "gp3", size = 128 } # root volume
         }
         tags = merge(local.defaults_web_ec2.tags, {
-          pre-migration     = "PPFWW0004"
-          description       = "Web Portal Server"
-          ami               = "pp-cafm-w-4-b"
+          pre-migration = "PPFWW0004"
+          description   = "Web Portal Server"
+          ami           = "pp-cafm-w-4-b"
         })
       })
 
@@ -117,9 +117,9 @@ locals {
           "/dev/sda1" = { type = "gp3", size = 128 } # root volume
         }
         tags = merge(local.defaults_web_ec2.tags, {
-          pre-migration     = "PPFWW0005"
-          description       = "Migrated server PPFWW0005 Web Portal Server"
-          ami               = "pp-cafm-w-5-a"
+          pre-migration = "PPFWW0005"
+          description   = "Migrated server PPFWW0005 Web Portal Server"
+          ami           = "pp-cafm-w-5-a"
         })
       })
     }
diff --git a/terraform/environments/planetfm/locals_production.tf b/terraform/environments/planetfm/locals_production.tf
index e951465ae81..e9890b3fe54 100644
--- a/terraform/environments/planetfm/locals_production.tf
+++ b/terraform/environments/planetfm/locals_production.tf
@@ -84,9 +84,9 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 200 }
         }
         tags = {
-          pre-migration     = "PDFAW0010"
-          description       = "RDS Session Host and CAFM App Server/PFME Licence Server"
-          ami               = "pd-cafm-a-10-b"
+          pre-migration = "PDFAW0010"
+          description   = "RDS Session Host and CAFM App Server/PFME Licence Server"
+          ami           = "pd-cafm-a-10-b"
         }
         route53_records = {
           create_internal_record = true
@@ -110,9 +110,9 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 200 }
         }
         tags = {
-          pre-migration     = "PDFWA0011"
-          description       = "RDS session host and app server"
-          ami               = "pd-cafm-a-11-a"
+          pre-migration = "PDFWA0011"
+          description   = "RDS session host and app server"
+          ami           = "pd-cafm-a-11-a"
         }
         route53_records = {
           create_internal_record = true
@@ -136,9 +136,9 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 200 }
         }
         tags = {
-          pre-migration     = "PDFAW0012"
-          description       = "RDS session host and app Server"
-          ami               = "pd-cafm-a-12-b"
+          pre-migration = "PDFAW0012"
+          description   = "RDS session host and app Server"
+          ami           = "pd-cafm-a-12-b"
         }
         route53_records = {
           create_internal_record = true
@@ -162,9 +162,9 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 28 }
         }
         tags = {
-          pre-migration     = "PDFAW0013"
-          description       = "RDS session host and App Server"
-          ami               = "pd-cafm-a-13-a"
+          pre-migration = "PDFAW0013"
+          description   = "RDS session host and App Server"
+          ami           = "pd-cafm-a-13-a"
         }
         route53_records = {
           create_internal_record = true
@@ -190,9 +190,9 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 28 }
         }
         tags = {
-          pre-migration     = "PDFWW00036"
-          description       = "CAFM Asset Management"
-          ami               = "pd-cafm-w-36-b"
+          pre-migration = "PDFWW00036"
+          description   = "CAFM Asset Management"
+          ami           = "pd-cafm-w-36-b"
         }
         route53_records = {
           create_internal_record = true
@@ -216,9 +216,9 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 28 }
         }
         tags = {
-          pre-migration     = "PFWW00037"
-          description       = "CAFM Assessment Management"
-          ami               = "pd-cafm-w-37-a"
+          pre-migration = "PFWW00037"
+          description   = "CAFM Assessment Management"
+          ami           = "pd-cafm-w-37-a"
         }
         route53_records = {
           create_internal_record = true
@@ -242,9 +242,9 @@ locals {
           "/dev/sdb"  = { type = "gp3", size = 100 }
         }
         tags = {
-          pre-migration     = "PDFWW3QCP660001"
-          description       = "CAFM Web Training"
-          ami               = "pd-cafm-w-38-b"
+          pre-migration = "PDFWW3QCP660001"
+          description   = "CAFM Web Training"
+          ami           = "pd-cafm-w-38-b"
         }
         route53_records = {
           create_internal_record = true
diff --git a/terraform/modules/baseline/bastion_linux.tf b/terraform/modules/baseline/bastion_linux.tf
index 4cddaef418b..78e31685fc8 100644
--- a/terraform/modules/baseline/bastion_linux.tf
+++ b/terraform/modules/baseline/bastion_linux.tf
@@ -11,7 +11,7 @@ module "bastion_linux" {
   }
 
   # s3 - used for logs and user ssh public keys
-  bucket_name          = var.bastion_linux.bucket_name
+  bucket_name = var.bastion_linux.bucket_name
 
   # public keys
   public_key_data = var.bastion_linux.public_key_data