diff --git a/policies/ecc-aws-040-eks_cluster_version_latest.yml b/policies/ecc-aws-040-eks_cluster_version_latest.yml
index 074c31030..076eb58ca 100644
--- a/policies/ecc-aws-040-eks_cluster_version_latest.yml
+++ b/policies/ecc-aws-040-eks_cluster_version_latest.yml
@@ -14,5 +14,9 @@ policies:
     filters:
       - type: value
         key: version
-        value: "1.29"
+        value: "1.31"
         op: lt
+      - type: value
+        key: version
+        value: "1.28"
+        op: gte
diff --git a/policies/ecc-aws-283-elasticsearch_latest_version.yml b/policies/ecc-aws-283-elasticsearch_latest_version.yml
index d931553b2..19bc7d1c3 100644
--- a/policies/ecc-aws-283-elasticsearch_latest_version.yml
+++ b/policies/ecc-aws-283-elasticsearch_latest_version.yml
@@ -9,10 +9,10 @@ policies:
   - name: ecc-aws-283-elasticsearch_latest_version
     comment: '010021052000'
     description: |
-      ElasticSearch is not using the latest OpenSearch version
+      OpenSearch is not using the latest engine version
     resource: elasticsearch
     filters:
       - not:
           - type: value
             key: ElasticsearchVersion
-            value: 'OpenSearch_2.11'
+            value: 'OpenSearch_2.15'
diff --git a/policies/ecc-aws-434-mq_broker_latest_version.yml b/policies/ecc-aws-434-mq_broker_latest_version.yml
index 822449252..09658bc1a 100644
--- a/policies/ecc-aws-434-mq_broker_latest_version.yml
+++ b/policies/ecc-aws-434-mq_broker_latest_version.yml
@@ -18,7 +18,7 @@ policies:
                   - type: value
                     key: EngineVersion
                     op: regex
-                    value: 3.12.*
+                    value: 3.13.*
                   - type: value
                     key: EngineType
                     value: RabbitMQ
@@ -26,7 +26,7 @@ policies:
                   - type: value
                     key: EngineVersion
                     op: regex
-                    value: 5.17.*
+                    value: 5.18.*
                   - type: value
                     key: EngineType
                     value: ActiveMQ
diff --git a/policies/ecc-aws-461-lambda_latest_runtime_environment_version.yml b/policies/ecc-aws-461-lambda_latest_runtime_environment_version.yml
index faebdc242..14c16e43d 100644
--- a/policies/ecc-aws-461-lambda_latest_runtime_environment_version.yml
+++ b/policies/ecc-aws-461-lambda_latest_runtime_environment_version.yml
@@ -15,8 +15,8 @@ policies:
       - type: value
         key: PackageType
         value: Zip
-      - not:
-          - type: value
-            key: Runtime
-            op: regex
-            value: '(nodejs20.x|python3.12|java21|dotnetcore3.1|dotnet6|go1.x|ruby3.2)'
+      - type: value
+        key: Runtime
+        op: in
+        value: [nodejs18.x, python3.11, python3.10, python3.9, java17, java11, java8.al2, dotnet6, ruby3.2, provided.al2]
+
diff --git a/policies/ecc-aws-497-eks_cluster_oldest_supported_version.yml b/policies/ecc-aws-497-eks_cluster_oldest_supported_version.yml
index 6e7bc9b2c..4773db41f 100644
--- a/policies/ecc-aws-497-eks_cluster_oldest_supported_version.yml
+++ b/policies/ecc-aws-497-eks_cluster_oldest_supported_version.yml
@@ -9,10 +9,10 @@ policies:
   - name: ecc-aws-497-eks_cluster_oldest_supported_version
     comment: '010021072000'
     description: |
-      EKS cluster is using unsupported version
+      EKS cluster is using extended support version
     resource: aws.eks
     filters:
       - type: value
         key: version
-        value: "1.23"
+        value: "1.28"
         op: lt
diff --git a/policies/ecc-aws-508-mwaa_latest_version.yml b/policies/ecc-aws-508-mwaa_latest_version.yml
index 659a0d017..a8a6936c7 100644
--- a/policies/ecc-aws-508-mwaa_latest_version.yml
+++ b/policies/ecc-aws-508-mwaa_latest_version.yml
@@ -15,4 +15,4 @@ policies:
       - not:
           - type: value
             key: AirflowVersion
-            value: '2.9.2'
+            value: '2.10.1'
diff --git a/policies/ecc-aws-536-lambda_function_settings_check.yml b/policies/ecc-aws-536-lambda_function_settings_check.yml
index 02564de93..d49fa6bd7 100644
--- a/policies/ecc-aws-536-lambda_function_settings_check.yml
+++ b/policies/ecc-aws-536-lambda_function_settings_check.yml
@@ -9,7 +9,7 @@ policies:
   - name: ecc-aws-536-lambda_function_settings_check
     comment: '010028030400'
     description: |
-      Lambda functions should not use no longer supported runtimes
+      Lambda functions should not use deprecated runtimes
     resource: aws.lambda
     filters:
       - type: value
@@ -19,4 +19,4 @@ policies:
           - type: value
             key: Runtime
             op: in
-            value: [dotnet8, dotnet6, java21, java17, java11, java8.al2, nodejs20.x, nodejs18.x, nodejs16.x, python3.12, python3.11, python3.10, python3.9, python3.8, ruby3.3, ruby3.2]
+            value: [nodejs20.x, nodejs18.x, python3.12, python3.11, python3.10, python3.9, java21, java17, java11, java8.al2, dotnet8, dotnet6, ruby3.3, ruby3.2, provided.al2023, provided.al2]
diff --git a/policies/ecc-aws-549-ec2_instance_previous_generation.yml b/policies/ecc-aws-549-ec2_instance_previous_generation.yml
index 6adefe277..4bd8f77da 100755
--- a/policies/ecc-aws-549-ec2_instance_previous_generation.yml
+++ b/policies/ecc-aws-549-ec2_instance_previous_generation.yml
@@ -19,4 +19,4 @@ policies:
       - type: value
         key: InstanceType
         op: regex
-        value: '(m1|m2|m3|m4|t1|c1|c2|c3|i2|cr1|r3|r4|hs1|g2|a1|d2).[^\s]+'
+        value: '(m1|m2|m3|m4|t1|c1|c2|c3|c4|cc2|i2|cr1|r3|r4|hs1|g2|a1|d2).[^\s]+'
diff --git a/policies/ecc-aws-598-redshift_instance_generation.yml b/policies/ecc-aws-598-redshift_instance_generation.yml
index 9f4887b03..ba2bafc36 100644
--- a/policies/ecc-aws-598-redshift_instance_generation.yml
+++ b/policies/ecc-aws-598-redshift_instance_generation.yml
@@ -15,4 +15,4 @@ policies:
       - type: value
         key: NodeType
         op: regex
-        value: '(dc1|ds2).[^\s]+'
+        value: '(dc1|ds1|ds2).[^\s]+'
diff --git a/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/green/lb.tf b/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/green/lb.tf
index 016db0704..776083b70 100644
--- a/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/green/lb.tf
+++ b/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/green/lb.tf
@@ -13,9 +13,14 @@ data "aws_ami" "this" {
   }
 }
 
+data "aws_availability_zones" "this" {
+  state = "available"
+}
+
 resource "aws_elb" "this" {
   name               = "elb-013-http-green"
-  availability_zones = ["us-east-1a", "us-east-1b", "us-east-1c"]
+  security_groups = [aws_security_group.this.id]
+  availability_zones = [data.aws_availability_zones.this.names[0], data.aws_availability_zones.this.names[1]]
 
   listener {
     instance_port      = 8000
@@ -32,6 +37,26 @@ resource "aws_elb" "this" {
   connection_draining_timeout = 400
 }
 
+resource "aws_load_balancer_policy" "this" {
+  load_balancer_name = aws_elb.this.name
+  policy_name        = "policygreen"
+  policy_type_name   = "SSLNegotiationPolicyType"
+
+  policy_attribute {
+    name  = "Reference-Security-Policy"
+    value = "ELBSecurityPolicy-TLS-1-2-2017-01"
+  }
+}
+
+resource "aws_load_balancer_listener_policy" "this" {
+  load_balancer_name = aws_elb.this.name
+  load_balancer_port = 443
+
+  policy_names = [
+    aws_load_balancer_policy.this.policy_name,
+  ]
+}
+
 resource "tls_private_key" "this" {
   algorithm = "RSA"
 }
@@ -57,23 +82,3 @@ resource "aws_acm_certificate" "this" {
   private_key      = tls_private_key.this.private_key_pem
   certificate_body = tls_self_signed_cert.this.cert_pem
 }
-
-resource "aws_load_balancer_policy" "this" {
-  load_balancer_name = aws_elb.this.name
-  policy_name        = "policygreen"
-  policy_type_name   = "SSLNegotiationPolicyType"
-
-  policy_attribute {
-    name  = "Reference-Security-Policy"
-    value = "ELBSecurityPolicy-TLS-1-2-2017-01"
-  }
-}
-
-resource "aws_load_balancer_listener_policy" "this" {
-  load_balancer_name = aws_elb.this.name
-  load_balancer_port = 443
-
-  policy_names = [
-    aws_load_balancer_policy.this.policy_name,
-  ]
-}
\ No newline at end of file
diff --git a/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/green/vpc.tf b/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/green/vpc.tf
new file mode 100644
index 000000000..fbc5e0244
--- /dev/null
+++ b/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/green/vpc.tf
@@ -0,0 +1,12 @@
+data "aws_vpc" "default" {
+  default = true
+}
+
+resource "aws_security_group" "this" {
+  name   = "013_security_group_green"
+  vpc_id = data.aws_vpc.default.id
+
+  tags = {
+    Name = "013_security_group_green"
+  }
+}
\ No newline at end of file
diff --git a/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/red/lb.tf b/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/red/lb.tf
index ec29af2b3..d3d4817b0 100644
--- a/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/red/lb.tf
+++ b/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/red/lb.tf
@@ -15,7 +15,7 @@ data "aws_ami" "this" {
 
 resource "aws_elb" "this" {
   name               = "elb-013-http-red"
-  availability_zones = ["us-east-1a", "us-east-1b", "us-east-1c"]
+  availability_zones = [data.aws_availability_zones.this.names[0], data.aws_availability_zones.this.names[1]]
 
   listener {
     instance_port      = 8000
@@ -30,6 +30,14 @@ resource "aws_elb" "this" {
   idle_timeout                = 400
   connection_draining         = true
   connection_draining_timeout = 400
+  security_groups = [aws_security_group.this.id]
+}
+
+resource "aws_load_balancer_listener_policy" "this" {
+  load_balancer_name = aws_elb.this.name
+  load_balancer_port = 443
+
+  policy_names = ["ELBSecurityPolicy-2016-08"]
 }
 
 resource "tls_private_key" "this" {
diff --git a/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/red/vpc.tf b/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/red/vpc.tf
new file mode 100644
index 000000000..04c171735
--- /dev/null
+++ b/terraform/ecc-aws-013-remove_weak_ciphers_for_clb/red/vpc.tf
@@ -0,0 +1,16 @@
+data "aws_vpc" "default" {
+  default = true
+}
+
+resource "aws_security_group" "this" {
+  name   = "013_security_group_red"
+  vpc_id = data.aws_vpc.default.id
+
+  tags = {
+    Name = "013_security_group_red"
+  }
+}
+
+data "aws_availability_zones" "this" {
+  state = "available"
+}
\ No newline at end of file
diff --git a/terraform/ecc-aws-040-eks_cluster_version_latest/green/eks.tf b/terraform/ecc-aws-040-eks_cluster_version_latest/green/eks.tf
index 97edb81f2..e8c1f5fa0 100644
--- a/terraform/ecc-aws-040-eks_cluster_version_latest/green/eks.tf
+++ b/terraform/ecc-aws-040-eks_cluster_version_latest/green/eks.tf
@@ -1,7 +1,7 @@
 resource "aws_eks_cluster" "this" {
   name     = "040_eks_cluster_green"
   role_arn = aws_iam_role.this.arn
-  version  = "1.29"
+  version  = "1.31"
 
   vpc_config {
     subnet_ids = [aws_subnet.subnet1.id, aws_subnet.subnet2.id]
@@ -14,7 +14,6 @@ resource "aws_eks_cluster" "this" {
 
 resource "aws_iam_role" "this" {
   name = "eks-040-cluster-green"
-
   assume_role_policy = <<POLICY
 {
   "Version": "2012-10-17",
@@ -49,11 +48,15 @@ resource "aws_vpc" "this" {
 resource "aws_subnet" "subnet1" {
   vpc_id            = aws_vpc.this.id
   cidr_block        = "10.0.1.0/24"
-  availability_zone = "us-east-1a"
+  availability_zone = data.aws_availability_zones.this.names[0]
 }
 
 resource "aws_subnet" "subnet2" {
   vpc_id            = aws_vpc.this.id
   cidr_block        = "10.0.2.0/24"
-  availability_zone = "us-east-1b"
+  availability_zone = data.aws_availability_zones.this.names[1]
 }
+
+data "aws_availability_zones" "this" {
+  state = "available"
+}
\ No newline at end of file
diff --git a/terraform/ecc-aws-040-eks_cluster_version_latest/iam/040-policy.json b/terraform/ecc-aws-040-eks_cluster_version_latest/iam/040-policy.json
index 720934ee2..f6abddef5 100644
--- a/terraform/ecc-aws-040-eks_cluster_version_latest/iam/040-policy.json
+++ b/terraform/ecc-aws-040-eks_cluster_version_latest/iam/040-policy.json
@@ -1,14 +1,13 @@
 {
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Effect": "Allow",
-            "Action": [ 
-                "eks:DescribeCluster",
-                "eks:ListClusters",
-                "ec2:DescribeVpcs"
-            ],
-            "Resource": "*"
-        }
-    ]
-}
+	"Version": "2012-10-17",
+	"Statement": [
+		{
+			"Effect": "Allow",
+			"Action": [
+				"eks:ListClusters",
+				"eks:DescribeCluster"
+			],
+			"Resource": "*"
+		}
+	]
+}
\ No newline at end of file
diff --git a/terraform/ecc-aws-040-eks_cluster_version_latest/red/eks.tf b/terraform/ecc-aws-040-eks_cluster_version_latest/red/eks.tf
index f636aa64d..1cc8bcf23 100644
--- a/terraform/ecc-aws-040-eks_cluster_version_latest/red/eks.tf
+++ b/terraform/ecc-aws-040-eks_cluster_version_latest/red/eks.tf
@@ -1,7 +1,7 @@
 resource "aws_eks_cluster" "this" {
   name     = "040_eks_cluster_red"
   role_arn = aws_iam_role.this.arn
-  version  = "1.27"
+  version  = "1.28"
 
   vpc_config {
     subnet_ids = [aws_subnet.subnet1.id, aws_subnet.subnet2.id]
@@ -14,7 +14,6 @@ resource "aws_eks_cluster" "this" {
 
 resource "aws_iam_role" "this" {
   name = "eks-cluster-040-red"
-
   assume_role_policy = <<POLICY
 {
   "Version": "2012-10-17",
@@ -49,12 +48,16 @@ resource "aws_vpc" "this" {
 resource "aws_subnet" "subnet1" {
   vpc_id            = aws_vpc.this.id
   cidr_block        = "10.0.1.0/24"
-  availability_zone = "us-east-1a"
+  availability_zone = data.aws_availability_zones.this.names[0]
 }
 
 resource "aws_subnet" "subnet2" {
   vpc_id            = aws_vpc.this.id
   cidr_block        = "10.0.2.0/24"
-  availability_zone = "us-east-1b"
+  availability_zone = data.aws_availability_zones.this.names[1]
+}
+
+data "aws_availability_zones" "this" {
+  state = "available"
 }
 
diff --git a/terraform/ecc-aws-283-elasticsearch_latest_version/green/elasticsearch.tf b/terraform/ecc-aws-283-elasticsearch_latest_version/green/elasticsearch.tf
index 1ed68e2a5..014688587 100644
--- a/terraform/ecc-aws-283-elasticsearch_latest_version/green/elasticsearch.tf
+++ b/terraform/ecc-aws-283-elasticsearch_latest_version/green/elasticsearch.tf
@@ -1,6 +1,8 @@
+# takes about 20 min to deploy
+
 resource "aws_elasticsearch_domain" "this" {
   domain_name           = "elasticsearch-283-green"
-  elasticsearch_version = "OpenSearch_2.11"
+  elasticsearch_version = "OpenSearch_2.15"
 
   ebs_options {
     ebs_enabled = true
diff --git a/terraform/ecc-aws-283-elasticsearch_latest_version/red/elasticsearch.tf b/terraform/ecc-aws-283-elasticsearch_latest_version/red/elasticsearch.tf
index a34740562..f46fdc689 100644
--- a/terraform/ecc-aws-283-elasticsearch_latest_version/red/elasticsearch.tf
+++ b/terraform/ecc-aws-283-elasticsearch_latest_version/red/elasticsearch.tf
@@ -1,3 +1,5 @@
+# takes about 20 min to deploy
+
 resource "aws_elasticsearch_domain" "this" {
   domain_name           = "elasticsearch-283-red"
   elasticsearch_version = "7.4"
diff --git a/terraform/ecc-aws-434-mq_broker_latest_version/green/mq.tf b/terraform/ecc-aws-434-mq_broker_latest_version/green/mq.tf
index 3f9f035f0..b41b3409b 100644
--- a/terraform/ecc-aws-434-mq_broker_latest_version/green/mq.tf
+++ b/terraform/ecc-aws-434-mq_broker_latest_version/green/mq.tf
@@ -1,8 +1,11 @@
+# takes about 10 min to deploy
+
 resource "aws_mq_broker" "this" {
   broker_name = "mq-broker-active-434-green"
   engine_type                = "ActiveMQ"
-  engine_version             = "5.17.6"
+  engine_version             = "5.18"
   host_instance_type         = "mq.t2.micro"
+  auto_minor_version_upgrade = true
 
   user {
     username = "root"
@@ -13,9 +16,10 @@ resource "aws_mq_broker" "this" {
 resource "aws_mq_broker" "this1" {
   broker_name = "mq-broker-rabbit-434-green"
   engine_type                = "RabbitMQ"
-  engine_version             = "3.12.13"
+  engine_version             = "3.13"
   host_instance_type         = "mq.t3.micro"
   publicly_accessible        = true
+  auto_minor_version_upgrade = true
   user {
     username = "root"
     password = random_password.this.result
diff --git a/terraform/ecc-aws-434-mq_broker_latest_version/red/mq.tf b/terraform/ecc-aws-434-mq_broker_latest_version/red/mq.tf
index aa4cb02c7..d3ba41e6d 100644
--- a/terraform/ecc-aws-434-mq_broker_latest_version/red/mq.tf
+++ b/terraform/ecc-aws-434-mq_broker_latest_version/red/mq.tf
@@ -1,7 +1,9 @@
+# takes about 10 min to deploy
+
 resource "aws_mq_broker" "this" {
   broker_name                = "mq-broker-active-434-red"
   engine_type                = "ActiveMQ"
-  engine_version             = "5.15.9"
+  engine_version             = "5.17.6"
   host_instance_type         = "mq.t2.micro"
 
   user {
@@ -13,7 +15,7 @@ resource "aws_mq_broker" "this" {
 resource "aws_mq_broker" "this1" {
   broker_name                = "mq-broker-rabbit-434-red"
   engine_type                = "RabbitMQ"
-  engine_version             = "3.8.30"
+  engine_version             = "3.11.28"
   host_instance_type         = "mq.t3.micro"
   publicly_accessible        = true
   user {
diff --git a/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/green/eks.tf b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/green/eks.tf
index 54052d995..05dd5824e 100644
--- a/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/green/eks.tf
+++ b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/green/eks.tf
@@ -1,6 +1,7 @@
 resource "aws_eks_cluster" "this" {
   name     = "497_eks_cluster_green"
   role_arn = aws_iam_role.this.arn
+  version  = "1.30"
 
   vpc_config {
     subnet_ids = [aws_subnet.subnet1.id, aws_subnet.subnet2.id]
@@ -13,7 +14,6 @@ resource "aws_eks_cluster" "this" {
 
 resource "aws_iam_role" "this" {
   name = "eks-497-cluster-green"
-
   assume_role_policy = <<POLICY
 {
   "Version": "2012-10-17",
@@ -48,11 +48,15 @@ resource "aws_vpc" "this" {
 resource "aws_subnet" "subnet1" {
   vpc_id            = aws_vpc.this.id
   cidr_block        = "10.0.1.0/24"
-  availability_zone = "us-east-1a"
+  availability_zone = data.aws_availability_zones.this.names[0]
 }
 
 resource "aws_subnet" "subnet2" {
   vpc_id            = aws_vpc.this.id
   cidr_block        = "10.0.2.0/24"
-  availability_zone = "us-east-1b"
+  availability_zone = data.aws_availability_zones.this.names[1]
+}
+
+data "aws_availability_zones" "this" {
+  state = "available"
 }
diff --git a/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/green/provider.tf b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/green/provider.tf
index e74fecd12..97d4c52a3 100644
--- a/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/green/provider.tf
+++ b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/green/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4"
+      version = "~> 5"
     }
   }
 }
diff --git a/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/eks.tf b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/eks.tf
new file mode 100644
index 000000000..e0c1ebfc1
--- /dev/null
+++ b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/eks.tf
@@ -0,0 +1,62 @@
+resource "aws_eks_cluster" "this" {
+  name     = "497_eks_cluster_red"
+  role_arn = aws_iam_role.this.arn
+  version  = "1.27"
+
+  vpc_config {
+    subnet_ids = [aws_subnet.subnet1.id, aws_subnet.subnet2.id]
+  }
+  depends_on = [
+    aws_iam_role_policy_attachment.Cluster_Policy,
+    aws_iam_role_policy_attachment.Service_Policy,
+  ]
+}
+
+resource "aws_iam_role" "this" {
+  name = "eks-497-cluster-red"
+  assume_role_policy = <<POLICY
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Principal": {
+        "Service": "eks.amazonaws.com"
+      },
+      "Action": "sts:AssumeRole"
+    }
+  ]
+}
+POLICY
+}
+
+resource "aws_iam_role_policy_attachment" "Cluster_Policy" {
+  policy_arn = "arn:aws:iam::aws:policy/AmazonEKSClusterPolicy"
+  role       = aws_iam_role.this.name
+}
+
+resource "aws_iam_role_policy_attachment" "Service_Policy" {
+  policy_arn = "arn:aws:iam::aws:policy/AmazonEKSServicePolicy"
+  role       = aws_iam_role.this.name
+}
+
+resource "aws_vpc" "this" {
+  cidr_block           = "10.0.0.0/16"
+  enable_dns_hostnames = true
+}
+
+resource "aws_subnet" "subnet1" {
+  vpc_id            = aws_vpc.this.id
+  cidr_block        = "10.0.1.0/24"
+  availability_zone = data.aws_availability_zones.this.names[0]
+}
+
+resource "aws_subnet" "subnet2" {
+  vpc_id            = aws_vpc.this.id
+  cidr_block        = "10.0.2.0/24"
+  availability_zone = data.aws_availability_zones.this.names[1]
+}
+
+data "aws_availability_zones" "this" {
+  state = "available"
+}
diff --git a/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/provider.tf b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/provider.tf
new file mode 100644
index 000000000..86bff5127
--- /dev/null
+++ b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/provider.tf
@@ -0,0 +1,20 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5"
+    }
+  }
+}
+
+provider "aws"{
+  profile = var.profile
+  region  = var.default-region
+  
+  default_tags {
+    tags = {
+      CustodianRule    = "ecc-aws-497-eks_cluster_oldest_supported_version"
+      ComplianceStatus = "Red"
+    }
+  }
+}
diff --git a/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/terraform.tfvars b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/terraform.tfvars
new file mode 100644
index 000000000..368bc468f
--- /dev/null
+++ b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/terraform.tfvars
@@ -0,0 +1,2 @@
+profile        = "c7n"
+default-region = "us-east-1"
\ No newline at end of file
diff --git a/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/variables.tf b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/variables.tf
new file mode 100644
index 000000000..948c49afd
--- /dev/null
+++ b/terraform/ecc-aws-497-eks_cluster_oldest_supported_version/red/variables.tf
@@ -0,0 +1,9 @@
+variable "default-region" {
+  type        = string
+  description = "Default region for resources will be created"
+}
+
+variable "profile" {
+  type        = string
+  description = "Profile name configured before running apply"
+}
\ No newline at end of file
diff --git a/terraform/ecc-aws-508-mwaa_latest_version/green/mwaa.tf b/terraform/ecc-aws-508-mwaa_latest_version/green/mwaa.tf
index d6fb27dde..2c9879811 100644
--- a/terraform/ecc-aws-508-mwaa_latest_version/green/mwaa.tf
+++ b/terraform/ecc-aws-508-mwaa_latest_version/green/mwaa.tf
@@ -1,3 +1,5 @@
+# takes 30 min to deploy, 20 min to destroy
+
 resource "aws_mwaa_environment" "this" {
   dag_s3_path        = "dags/"
   execution_role_arn = aws_iam_role.this.arn
diff --git a/terraform/ecc-aws-508-mwaa_latest_version/green/provider.tf b/terraform/ecc-aws-508-mwaa_latest_version/green/provider.tf
index 01299f4c5..322714463 100644
--- a/terraform/ecc-aws-508-mwaa_latest_version/green/provider.tf
+++ b/terraform/ecc-aws-508-mwaa_latest_version/green/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4"
+      version = "~> 5"
     }
   }
 }
diff --git a/terraform/ecc-aws-508-mwaa_latest_version/green/vpc.tf b/terraform/ecc-aws-508-mwaa_latest_version/green/vpc.tf
index 84900b15b..19e05bde9 100644
--- a/terraform/ecc-aws-508-mwaa_latest_version/green/vpc.tf
+++ b/terraform/ecc-aws-508-mwaa_latest_version/green/vpc.tf
@@ -40,11 +40,11 @@ resource "aws_subnet" "private2" {
 }
 
 resource "aws_eip" "this1" {
-  vpc        = true
+  domain   = "vpc"
   depends_on = [aws_internet_gateway.this]
 }
 resource "aws_eip" "this2" {
-  vpc        = true
+  domain   = "vpc"
   depends_on = [aws_internet_gateway.this]
 }
 
diff --git a/terraform/ecc-aws-508-mwaa_latest_version/red/mwaa.tf b/terraform/ecc-aws-508-mwaa_latest_version/red/mwaa.tf
index 59cfef248..4e914656f 100644
--- a/terraform/ecc-aws-508-mwaa_latest_version/red/mwaa.tf
+++ b/terraform/ecc-aws-508-mwaa_latest_version/red/mwaa.tf
@@ -1,9 +1,11 @@
+# takes 30 min to deploy, 20 min to destroy
+
 resource "aws_mwaa_environment" "this" {
   dag_s3_path        = "dags/"
   execution_role_arn = aws_iam_role.this.arn
   name               = "mwaa_508_red"
   max_workers        = 1
-  airflow_version    = "2.0.2"
+  airflow_version    = "2.8.1"
   network_configuration {
     security_group_ids = [aws_security_group.this.id]
     subnet_ids         = [aws_subnet.private1.id, aws_subnet.private2.id]
diff --git a/terraform/ecc-aws-508-mwaa_latest_version/red/provider.tf b/terraform/ecc-aws-508-mwaa_latest_version/red/provider.tf
index 01030d406..64d2b8fab 100644
--- a/terraform/ecc-aws-508-mwaa_latest_version/red/provider.tf
+++ b/terraform/ecc-aws-508-mwaa_latest_version/red/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4"
+      version = "~> 5"
     }
   }
 }
diff --git a/terraform/ecc-aws-508-mwaa_latest_version/red/vpc.tf b/terraform/ecc-aws-508-mwaa_latest_version/red/vpc.tf
index e9a3c557c..cd400ff73 100644
--- a/terraform/ecc-aws-508-mwaa_latest_version/red/vpc.tf
+++ b/terraform/ecc-aws-508-mwaa_latest_version/red/vpc.tf
@@ -40,11 +40,11 @@ resource "aws_subnet" "private2" {
 }
 
 resource "aws_eip" "this1" {
-  vpc        = true
+  domain   = "vpc"
   depends_on = [aws_internet_gateway.this]
 }
 resource "aws_eip" "this2" {
-  vpc        = true
+  domain   = "vpc"
   depends_on = [aws_internet_gateway.this]
 }
 
diff --git a/terraform/ecc-aws-536-lambda_function_settings_check/green/lambda.tf b/terraform/ecc-aws-536-lambda_function_settings_check/green/lambda.tf
index fd4f98758..6c9af68ba 100644
--- a/terraform/ecc-aws-536-lambda_function_settings_check/green/lambda.tf
+++ b/terraform/ecc-aws-536-lambda_function_settings_check/green/lambda.tf
@@ -47,5 +47,5 @@ resource "aws_lambda_function" "this" {
   function_name                  = "536_lambda_green"
   role                           = aws_iam_role.this.arn
   handler                        = "func.py"
-  runtime                        = "python3.8"
+  runtime                        = "python3.12"
 }
diff --git a/terraform/ecc-aws-536-lambda_function_settings_check/red/func.zip b/terraform/ecc-aws-536-lambda_function_settings_check/red/func.zip
new file mode 100644
index 000000000..3438f93d5
Binary files /dev/null and b/terraform/ecc-aws-536-lambda_function_settings_check/red/func.zip differ
diff --git a/terraform/ecc-aws-536-lambda_function_settings_check/red/lambda.tf b/terraform/ecc-aws-536-lambda_function_settings_check/red/lambda.tf
new file mode 100644
index 000000000..65db9207d
--- /dev/null
+++ b/terraform/ecc-aws-536-lambda_function_settings_check/red/lambda.tf
@@ -0,0 +1,51 @@
+resource "aws_iam_role" "this" {
+  name = "536_role_red"
+
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "lambda.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_role_policy" "this" {
+  name = "536_policy_red"
+  role = aws_iam_role.this.id
+
+  policy = <<-EOF
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": [
+                "ec2:DescribeNetworkInterfaces",
+                "ec2:CreateNetworkInterface",
+                "ec2:DeleteNetworkInterface",
+                "ec2:DescribeInstances",
+                "ec2:AttachNetworkInterface"
+                ],
+            "Resource": "*"
+        }
+    ]
+}
+  EOF
+}
+
+resource "aws_lambda_function" "this" {
+  filename      = "func.zip"
+  function_name = "536_lambda_red"
+  role          = aws_iam_role.this.arn
+  handler       = "lambda.py"
+  runtime       = "python3.8"
+}
diff --git a/terraform/ecc-aws-536-lambda_function_settings_check/red/provider.tf b/terraform/ecc-aws-536-lambda_function_settings_check/red/provider.tf
new file mode 100644
index 000000000..fa2573879
--- /dev/null
+++ b/terraform/ecc-aws-536-lambda_function_settings_check/red/provider.tf
@@ -0,0 +1,20 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5"
+    }
+  }
+}
+
+provider "aws" {
+  profile = var.profile
+  region  = var.default-region
+
+  default_tags {
+    tags = {
+      CustodianRule    = "ecc-aws-536-lambda_function_settings_check"
+      ComplianceStatus = "Red"
+    }
+  }
+}
diff --git a/terraform/ecc-aws-536-lambda_function_settings_check/red/terraform.tfvars b/terraform/ecc-aws-536-lambda_function_settings_check/red/terraform.tfvars
new file mode 100644
index 000000000..368bc468f
--- /dev/null
+++ b/terraform/ecc-aws-536-lambda_function_settings_check/red/terraform.tfvars
@@ -0,0 +1,2 @@
+profile        = "c7n"
+default-region = "us-east-1"
\ No newline at end of file
diff --git a/terraform/ecc-aws-536-lambda_function_settings_check/red/variables.tf b/terraform/ecc-aws-536-lambda_function_settings_check/red/variables.tf
new file mode 100644
index 000000000..948c49afd
--- /dev/null
+++ b/terraform/ecc-aws-536-lambda_function_settings_check/red/variables.tf
@@ -0,0 +1,9 @@
+variable "default-region" {
+  type        = string
+  description = "Default region for resources will be created"
+}
+
+variable "profile" {
+  type        = string
+  description = "Profile name configured before running apply"
+}
\ No newline at end of file
diff --git a/tests/ecc-aws-040-eks_cluster_version_latest/placebo-green/eks.DescribeCluster_1.json b/tests/ecc-aws-040-eks_cluster_version_latest/placebo-green/eks.DescribeCluster_1.json
index 4f7af50f4..86e0314a9 100644
--- a/tests/ecc-aws-040-eks_cluster_version_latest/placebo-green/eks.DescribeCluster_1.json
+++ b/tests/ecc-aws-040-eks_cluster_version_latest/placebo-green/eks.DescribeCluster_1.json
@@ -1,75 +1,75 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "cluster": {
-            "name": "040_eks_cluster_green",
-            "arn": "arn:aws:eks:us-east-1:111111111111:cluster/040_eks_cluster_green",
-            "createdAt": {
-                "__class__": "datetime",
-                "year": 2024,
-                "month": 5,
-                "day": 20,
-                "hour": 10,
-                "minute": 52,
-                "second": 28,
-                "microsecond": 667000
-            },
-            "version": "1.29",
-            "endpoint": "https://B85326B0FA2C4339003CE8EDF274DFD6.gr7.us-east-1.eks.amazonaws.com",
-            "roleArn": "arn:aws:iam::111111111111:role/eks-040-cluster-green",
-            "resourcesVpcConfig": {
-                "subnetIds": [
-                    "subnet-0a798bcc1005916c3",
-                    "subnet-08d42a8b71b0d8706"
-                ],
-                "securityGroupIds": [],
-                "clusterSecurityGroupId": "sg-07d377b01e9251a79",
-                "vpcId": "vpc-02afad6f2487a54f6",
-                "endpointPublicAccess": true,
-                "endpointPrivateAccess": false,
-                "publicAccessCidrs": [
-                    "0.0.0.0/0"
-                ]
-            },
-            "kubernetesNetworkConfig": {
-                "serviceIpv4Cidr": "172.20.0.0/16",
-                "ipFamily": "ipv4"
-            },
-            "logging": {
-                "clusterLogging": [
-                    {
-                        "types": [
-                            "api",
-                            "audit",
-                            "authenticator",
-                            "controllerManager",
-                            "scheduler"
-                        ],
-                        "enabled": false
-                    }
-                ]
-            },
-            "identity": {
-                "oidc": {
-                    "issuer": "https://oidc.eks.us-east-1.amazonaws.com/id/B85326B0FA2C4339003CE8EDF274DFD6"
-                }
-            },
-            "status": "ACTIVE",
-            "certificateAuthority": {
-                "data": "LS0tLS1CRUdJTiBDR"
-            },
-            "platformVersion": "eks.7",
-            "tags": {
-                "CustodianRule": "ecc-aws-040-eks_cluster_version_latest",
-                "ComplianceStatus": "Green"
-            },
-            "health": {
-                "issues": []
-            },
-            "accessConfig": {
-                "authenticationMode": "CONFIG_MAP"
-            }
-        }
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "cluster": {
+            "name": "040_eks_cluster_green",
+            "arn": "arn:aws:eks:us-east-1:644160558196:cluster/040_eks_cluster_green",
+            "createdAt": {
+                "__class__": "datetime",
+                "year": 2024,
+                "month": 11,
+                "day": 8,
+                "hour": 15,
+                "minute": 44,
+                "second": 27,
+                "microsecond": 853000
+            },
+            "version": "1.31",
+            "endpoint": "https://20370F362F18CA6C8AD640B86E70F675.sk1.us-east-1.eks.amazonaws.com",
+            "roleArn": "arn:aws:iam::644160558196:role/eks-040-cluster-green",
+            "resourcesVpcConfig": {
+                "subnetIds": [
+                    "subnet-0d0c23061da0dc26d",
+                    "subnet-0321ad0b92de8311e"
+                ],
+                "securityGroupIds": [],
+                "clusterSecurityGroupId": "sg-026eab2361121a56e",
+                "vpcId": "vpc-0b4bc9243302538d4",
+                "endpointPublicAccess": true,
+                "endpointPrivateAccess": false,
+                "publicAccessCidrs": [
+                    "0.0.0.0/0"
+                ]
+            },
+            "kubernetesNetworkConfig": {
+                "serviceIpv4Cidr": "172.20.0.0/16",
+                "ipFamily": "ipv4"
+            },
+            "logging": {
+                "clusterLogging": [
+                    {
+                        "types": [
+                            "api",
+                            "audit",
+                            "authenticator",
+                            "controllerManager",
+                            "scheduler"
+                        ],
+                        "enabled": false
+                    }
+                ]
+            },
+            "identity": {
+                "oidc": {
+                    "issuer": "https://oidc.eks.us-east-1.amazonaws.com/id/2037075"
+                }
+            },
+            "status": "ACTIVE",
+            "certificateAuthority": {
+                "data": "LS0tLS1"
+            },
+            "platformVersion": "eks.10",
+            "tags": {
+                "CustodianRule": "ecc-aws-040-eks_cluster_version_latest",
+                "ComplianceStatus": "Green"
+            },
+            "health": {
+                "issues": []
+            },
+            "accessConfig": {
+                "authenticationMode": "CONFIG_MAP"
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-040-eks_cluster_version_latest/placebo-green/eks.ListClusters_1.json b/tests/ecc-aws-040-eks_cluster_version_latest/placebo-green/eks.ListClusters_1.json
index ffd51636a..f512d2b1f 100644
--- a/tests/ecc-aws-040-eks_cluster_version_latest/placebo-green/eks.ListClusters_1.json
+++ b/tests/ecc-aws-040-eks_cluster_version_latest/placebo-green/eks.ListClusters_1.json
@@ -1,9 +1,9 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "clusters": [
-            "040_eks_cluster_green"
-        ]
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "clusters": [
+            "040_eks_cluster_green"
+        ]
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-040-eks_cluster_version_latest/placebo-red/eks.DescribeCluster_1.json b/tests/ecc-aws-040-eks_cluster_version_latest/placebo-red/eks.DescribeCluster_1.json
index fb8edec8c..c5bad3639 100644
--- a/tests/ecc-aws-040-eks_cluster_version_latest/placebo-red/eks.DescribeCluster_1.json
+++ b/tests/ecc-aws-040-eks_cluster_version_latest/placebo-red/eks.DescribeCluster_1.json
@@ -15,7 +15,7 @@
                 "second": 21,
                 "microsecond": 252000
             },
-            "version": "1.27",
+            "version": "1.28",
             "endpoint": "https://0C64300B4146E659D096274B98D6253B.gr7.us-east-1.eks.amazonaws.com",
             "roleArn": "arn:aws:iam::111111111111:role/eks-cluster-040-red",
             "resourcesVpcConfig": {
diff --git a/tests/ecc-aws-040-eks_cluster_version_latest/red_policy_test.py b/tests/ecc-aws-040-eks_cluster_version_latest/red_policy_test.py
index 2d21d3908..4a248dd6f 100644
--- a/tests/ecc-aws-040-eks_cluster_version_latest/red_policy_test.py
+++ b/tests/ecc-aws-040-eks_cluster_version_latest/red_policy_test.py
@@ -2,4 +2,5 @@ class PolicyTest(object):
 
     def test_resources(self, base_test, resources):
         base_test.assertEqual(len(resources), 1)
-        base_test.assertLess(resources[0]['version'], '1.29')
\ No newline at end of file
+        base_test.assertLess(resources[0]['version'], '1.31')
+        base_test.assertGreaterEqual(resources[0]['version'], '1.28')
\ No newline at end of file
diff --git a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.DescribeElasticsearchDomains_1.json b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.DescribeElasticsearchDomains_1.json
index b2ad701ef..da8f2d1da 100644
--- a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.DescribeElasticsearchDomains_1.json
+++ b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.DescribeElasticsearchDomains_1.json
@@ -1,83 +1,110 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "DomainStatusList": [
-            {
-                "DomainId": "111111111111/elasticsearch-283-green",
-                "DomainName": "elasticsearch-283-green",
-                "ARN": "arn:aws:es:us-east-1:111111111111:domain/elasticsearch-283-green",
-                "Created": true,
-                "Deleted": false,
-                "Endpoint": "search-elasticsearch-283-green-sqrl5fumngl6zniiccpgcym4py.us-east-1.es.amazonaws.com",
-                "Processing": false,
-                "UpgradeProcessing": false,
-                "ElasticsearchVersion": "OpenSearch_2.11",
-                "ElasticsearchClusterConfig": {
-                    "InstanceType": "m4.large.elasticsearch",
-                    "InstanceCount": 1,
-                    "DedicatedMasterEnabled": false,
-                    "ZoneAwarenessEnabled": false,
-                    "WarmEnabled": false,
-                    "ColdStorageOptions": {
-                        "Enabled": false
-                    }
-                },
-                "EBSOptions": {
-                    "EBSEnabled": true,
-                    "VolumeType": "gp2",
-                    "VolumeSize": 10
-                },
-                "AccessPolicies": "",
-                "SnapshotOptions": {
-                    "AutomatedSnapshotStartHour": 0
-                },
-                "CognitoOptions": {
-                    "Enabled": false
-                },
-                "EncryptionAtRestOptions": {
-                    "Enabled": false
-                },
-                "NodeToNodeEncryptionOptions": {
-                    "Enabled": false
-                },
-                "AdvancedOptions": {
-                    "override_main_response_version": "false",
-                    "rest.action.multi.allow_explicit_index": "true"
-                },
-                "ServiceSoftwareOptions": {
-                    "CurrentVersion": "R20221114-P1",
-                    "NewVersion": "",
-                    "UpdateAvailable": false,
-                    "Cancellable": false,
-                    "UpdateStatus": "COMPLETED",
-                    "Description": "There is no software update available for this domain.",
-                    "AutomatedUpdateDate": {
-                        "__class__": "datetime",
-                        "year": 1970,
-                        "month": 1,
-                        "day": 1,
-                        "hour": 2,
-                        "minute": 0,
-                        "second": 0,
-                        "microsecond": 0
-                    },
-                    "OptionalDeployment": true
-                },
-                "DomainEndpointOptions": {
-                    "EnforceHTTPS": false,
-                    "TLSSecurityPolicy": "Policy-Min-TLS-1-0-2019-07",
-                    "CustomEndpointEnabled": false
-                },
-                "AdvancedSecurityOptions": {
-                    "Enabled": false,
-                    "InternalUserDatabaseEnabled": false,
-                    "AnonymousAuthEnabled": false
-                },
-                "AutoTuneOptions": {
-                    "State": "ENABLED"
-                }
-            }
-        ]
-    }
-}
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "DomainStatusList": [
+            {
+                "DomainId": "644160558196/elasticsearch-283-green",
+                "DomainName": "elasticsearch-283-green",
+                "ARN": "arn:aws:es:us-east-1:644160558196:domain/elasticsearch-283-green",
+                "Created": true,
+                "Deleted": false,
+                "Endpoint": "search-elasticsearch-283-green-5dqs3erm5dk3a6t37elyi3tmai.us-east-1.es.amazonaws.com",
+                "Processing": false,
+                "UpgradeProcessing": false,
+                "ElasticsearchVersion": "OpenSearch_2.15",
+                "ElasticsearchClusterConfig": {
+                    "InstanceType": "m4.large.elasticsearch",
+                    "InstanceCount": 1,
+                    "DedicatedMasterEnabled": false,
+                    "ZoneAwarenessEnabled": false,
+                    "WarmEnabled": false,
+                    "ColdStorageOptions": {
+                        "Enabled": false
+                    }
+                },
+                "EBSOptions": {
+                    "EBSEnabled": true,
+                    "VolumeType": "gp2",
+                    "VolumeSize": 10
+                },
+                "AccessPolicies": "",
+                "SnapshotOptions": {
+                    "AutomatedSnapshotStartHour": 0
+                },
+                "CognitoOptions": {
+                    "Enabled": false
+                },
+                "EncryptionAtRestOptions": {
+                    "Enabled": false
+                },
+                "NodeToNodeEncryptionOptions": {
+                    "Enabled": false
+                },
+                "AdvancedOptions": {
+                    "override_main_response_version": "false",
+                    "rest.action.multi.allow_explicit_index": "true"
+                },
+                "ServiceSoftwareOptions": {
+                    "CurrentVersion": "OpenSearch_2_15_R20240904-P4",
+                    "NewVersion": "",
+                    "UpdateAvailable": false,
+                    "Cancellable": false,
+                    "UpdateStatus": "COMPLETED",
+                    "Description": "There is no software update available for this domain.",
+                    "AutomatedUpdateDate": {
+                        "__class__": "datetime",
+                        "year": 1970,
+                        "month": 1,
+                        "day": 1,
+                        "hour": 0,
+                        "minute": 0,
+                        "second": 0,
+                        "microsecond": 0
+                    },
+                    "OptionalDeployment": true
+                },
+                "DomainEndpointOptions": {
+                    "EnforceHTTPS": false,
+                    "TLSSecurityPolicy": "Policy-Min-TLS-1-2-2019-07",
+                    "CustomEndpointEnabled": false
+                },
+                "AdvancedSecurityOptions": {
+                    "Enabled": false,
+                    "InternalUserDatabaseEnabled": false,
+                    "AnonymousAuthEnabled": false
+                },
+                "AutoTuneOptions": {
+                    "State": "DISABLED"
+                },
+                "ChangeProgressDetails": {
+                    "ChangeId": "9cd23c15-2b90-443e-b7e7-f149c351c4d8",
+                    "ConfigChangeStatus": "Completed",
+                    "StartTime": {
+                        "__class__": "datetime",
+                        "year": 2024,
+                        "month": 11,
+                        "day": 11,
+                        "hour": 10,
+                        "minute": 41,
+                        "second": 51,
+                        "microsecond": 700000
+                    },
+                    "LastUpdatedTime": {
+                        "__class__": "datetime",
+                        "year": 2024,
+                        "month": 11,
+                        "day": 11,
+                        "hour": 11,
+                        "minute": 1,
+                        "second": 40,
+                        "microsecond": 516000
+                    },
+                    "InitiatedBy": "CUSTOMER"
+                },
+                "DomainProcessingStatus": "Active",
+                "ModifyingProperties": []
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.ListDomainNames_1.json b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.ListDomainNames_1.json
index 62d3f6efe..1e558b691 100644
--- a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.ListDomainNames_1.json
+++ b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.ListDomainNames_1.json
@@ -1,12 +1,12 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "DomainNames": [
-            {
-                "DomainName": "elasticsearch-283-green",
-                "EngineType": "OpenSearch"
-            }
-        ]
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "DomainNames": [
+            {
+                "DomainName": "elasticsearch-283-green",
+                "EngineType": "OpenSearch"
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.ListTags_1.json b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.ListTags_1.json
index 6322f2c2d..b10ce0217 100644
--- a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.ListTags_1.json
+++ b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-green/es.ListTags_1.json
@@ -1,16 +1,16 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "TagList": [
-            {
-                "Key": "CustodianRule",
-                "Value": "ecc-aws-283-elasticsearch_latest_version"
-            },
-            {
-                "Key": "ComplianceStatus",
-                "Value": "Green"
-            }
-        ]
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "TagList": [
+            {
+                "Key": "CustodianRule",
+                "Value": "ecc-aws-283-elasticsearch_latest_version"
+            },
+            {
+                "Key": "ComplianceStatus",
+                "Value": "Green"
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.DescribeElasticsearchDomains_1.json b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.DescribeElasticsearchDomains_1.json
index d0dca05a7..af25248eb 100644
--- a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.DescribeElasticsearchDomains_1.json
+++ b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.DescribeElasticsearchDomains_1.json
@@ -1,82 +1,110 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "DomainStatusList": [
-            {
-                "DomainId": "111111111111/elasticsearch-283-red",
-                "DomainName": "elasticsearch-283-red",
-                "ARN": "arn:aws:es:us-east-1:111111111111:domain/elasticsearch-283-red",
-                "Created": true,
-                "Deleted": false,
-                "Endpoint": "search-elasticsearch-283-red-h6asndcluofgetahpb7h6ule24.us-east-1.es.amazonaws.com",
-                "Processing": false,
-                "UpgradeProcessing": false,
-                "ElasticsearchVersion": "7.4",
-                "ElasticsearchClusterConfig": {
-                    "InstanceType": "m4.large.elasticsearch",
-                    "InstanceCount": 1,
-                    "DedicatedMasterEnabled": false,
-                    "ZoneAwarenessEnabled": false,
-                    "WarmEnabled": false,
-                    "ColdStorageOptions": {
-                        "Enabled": false
-                    }
-                },
-                "EBSOptions": {
-                    "EBSEnabled": true,
-                    "VolumeType": "gp2",
-                    "VolumeSize": 10
-                },
-                "AccessPolicies": "",
-                "SnapshotOptions": {
-                    "AutomatedSnapshotStartHour": 0
-                },
-                "CognitoOptions": {
-                    "Enabled": false
-                },
-                "EncryptionAtRestOptions": {
-                    "Enabled": false
-                },
-                "NodeToNodeEncryptionOptions": {
-                    "Enabled": false
-                },
-                "AdvancedOptions": {
-                    "override_main_response_version": "false",
-                    "rest.action.multi.allow_explicit_index": "true"
-                },
-                "ServiceSoftwareOptions": {
-                    "CurrentVersion": "R20211203-P2",
-                    "NewVersion": "",
-                    "UpdateAvailable": false,
-                    "Cancellable": false,
-                    "UpdateStatus": "COMPLETED",
-                    "Description": "There is no software update available for this domain.",
-                    "AutomatedUpdateDate": {
-                        "__class__": "datetime",
-                        "year": 2021,
-                        "month": 12,
-                        "day": 15,
-                        "hour": 22,
-                        "minute": 7,
-                        "second": 0,
-                        "microsecond": 0
-                    },
-                    "OptionalDeployment": false
-                },
-                "DomainEndpointOptions": {
-                    "EnforceHTTPS": false,
-                    "TLSSecurityPolicy": "Policy-Min-TLS-1-0-2019-07",
-                    "CustomEndpointEnabled": false
-                },
-                "AdvancedSecurityOptions": {
-                    "Enabled": false,
-                    "InternalUserDatabaseEnabled": false
-                },
-                "AutoTuneOptions": {
-                    "State": "ENABLED"
-                }
-            }
-        ]
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "DomainStatusList": [
+            {
+                "DomainId": "644160558196/elasticsearch-283-red",
+                "DomainName": "elasticsearch-283-red",
+                "ARN": "arn:aws:es:us-east-1:644160558196:domain/elasticsearch-283-red",
+                "Created": true,
+                "Deleted": false,
+                "Endpoint": "search-elasticsearch-283-red-nn7tkpnvpivxzn7yukfzhwq26m.us-east-1.es.amazonaws.com",
+                "Processing": false,
+                "UpgradeProcessing": false,
+                "ElasticsearchVersion": "7.4",
+                "ElasticsearchClusterConfig": {
+                    "InstanceType": "m4.large.elasticsearch",
+                    "InstanceCount": 1,
+                    "DedicatedMasterEnabled": false,
+                    "ZoneAwarenessEnabled": false,
+                    "WarmEnabled": false,
+                    "ColdStorageOptions": {
+                        "Enabled": false
+                    }
+                },
+                "EBSOptions": {
+                    "EBSEnabled": true,
+                    "VolumeType": "gp2",
+                    "VolumeSize": 10
+                },
+                "AccessPolicies": "",
+                "SnapshotOptions": {
+                    "AutomatedSnapshotStartHour": 0
+                },
+                "CognitoOptions": {
+                    "Enabled": false
+                },
+                "EncryptionAtRestOptions": {
+                    "Enabled": false
+                },
+                "NodeToNodeEncryptionOptions": {
+                    "Enabled": false
+                },
+                "AdvancedOptions": {
+                    "override_main_response_version": "false",
+                    "rest.action.multi.allow_explicit_index": "true"
+                },
+                "ServiceSoftwareOptions": {
+                    "CurrentVersion": "Elasticsearch_7_4_R20241003",
+                    "NewVersion": "",
+                    "UpdateAvailable": false,
+                    "Cancellable": false,
+                    "UpdateStatus": "COMPLETED",
+                    "Description": "There is no software update available for this domain.",
+                    "AutomatedUpdateDate": {
+                        "__class__": "datetime",
+                        "year": 1970,
+                        "month": 1,
+                        "day": 1,
+                        "hour": 0,
+                        "minute": 0,
+                        "second": 0,
+                        "microsecond": 0
+                    },
+                    "OptionalDeployment": true
+                },
+                "DomainEndpointOptions": {
+                    "EnforceHTTPS": false,
+                    "TLSSecurityPolicy": "Policy-Min-TLS-1-2-2019-07",
+                    "CustomEndpointEnabled": false
+                },
+                "AdvancedSecurityOptions": {
+                    "Enabled": false,
+                    "InternalUserDatabaseEnabled": false,
+                    "AnonymousAuthEnabled": false
+                },
+                "AutoTuneOptions": {
+                    "State": "DISABLED"
+                },
+                "ChangeProgressDetails": {
+                    "ChangeId": "32b8249b-cd0a-41f2-b5a4-1c477bab158c",
+                    "ConfigChangeStatus": "Completed",
+                    "StartTime": {
+                        "__class__": "datetime",
+                        "year": 2024,
+                        "month": 11,
+                        "day": 11,
+                        "hour": 10,
+                        "minute": 34,
+                        "second": 58,
+                        "microsecond": 817000
+                    },
+                    "LastUpdatedTime": {
+                        "__class__": "datetime",
+                        "year": 2024,
+                        "month": 11,
+                        "day": 11,
+                        "hour": 10,
+                        "minute": 55,
+                        "second": 52,
+                        "microsecond": 458000
+                    },
+                    "InitiatedBy": "CUSTOMER"
+                },
+                "DomainProcessingStatus": "Active",
+                "ModifyingProperties": []
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.ListDomainNames_1.json b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.ListDomainNames_1.json
index f0c3319ec..54a16f3b1 100644
--- a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.ListDomainNames_1.json
+++ b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.ListDomainNames_1.json
@@ -1,11 +1,12 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "DomainNames": [
-            {
-                "DomainName": "elasticsearch-283-red"
-            }
-        ]
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "DomainNames": [
+            {
+                "DomainName": "elasticsearch-283-red",
+                "EngineType": "Elasticsearch"
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.ListTags_1.json b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.ListTags_1.json
index db3be6e3f..62a2e594b 100644
--- a/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.ListTags_1.json
+++ b/tests/ecc-aws-283-elasticsearch_latest_version/placebo-red/es.ListTags_1.json
@@ -2,6 +2,15 @@
     "status_code": 200,
     "data": {
         "ResponseMetadata": {},
-        "TagList": []
+        "TagList": [
+            {
+                "Key": "CustodianRule",
+                "Value": "ecc-aws-283-elasticsearch_latest_version"
+            },
+            {
+                "Key": "ComplianceStatus",
+                "Value": "Red"
+            }
+        ]
     }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-283-elasticsearch_latest_version/red_policy_test.py b/tests/ecc-aws-283-elasticsearch_latest_version/red_policy_test.py
index 8b9c8bc76..5f27206a8 100644
--- a/tests/ecc-aws-283-elasticsearch_latest_version/red_policy_test.py
+++ b/tests/ecc-aws-283-elasticsearch_latest_version/red_policy_test.py
@@ -2,4 +2,4 @@ class PolicyTest(object):
 
      def test_resources(self, base_test, resources):
         base_test.assertEqual(len(resources), 1)
-        base_test.assertEqual(resources[0]['ElasticsearchVersion'], '7.4')
\ No newline at end of file
+        base_test.assertNotEqual(resources[0]['ElasticsearchVersion'], 'OpenSearch_2.15')
\ No newline at end of file
diff --git a/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.DescribeBroker_1.json b/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.DescribeBroker_1.json
index f880927ed..017da9243 100644
--- a/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.DescribeBroker_1.json
+++ b/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.DescribeBroker_1.json
@@ -3,27 +3,27 @@
     "data": {
         "ResponseMetadata": {},
         "AuthenticationStrategy": "simple",
-        "AutoMinorVersionUpgrade": false,
-        "BrokerArn": "arn:aws:mq:us-east-1:111111111111:broker:mq-broker-active-434-green:b-200c9daf-2b9a-4069-9082-dcfa081345aa",
-        "BrokerId": "b-200c9daf-2b9a-4069-9082-dcfa081345aa",
+        "AutoMinorVersionUpgrade": true,
+        "BrokerArn": "arn:aws:mq:us-east-1:644160558196:broker:mq-broker-active-434-green:b--a0f75899ac20",
+        "BrokerId": "b--a0f75899ac20",
         "BrokerInstances": [
             {
-                "ConsoleURL": "https://b-200c9daf-2b9a-4069-9082-dcfa081345aa-1.mq.us-east-1.amazonaws.com:8162",
+                "ConsoleURL": "https://b--a0f75899ac20-1.mq.us-east-1.amazonaws.com:8162",
                 "Endpoints": [
-                    "ssl://b-200c9daf-2b9a-4069-9082-dcfa081345aa-1.mq.us-east-1.amazonaws.com:61617",
-                    "amqp+ssl://b-200c9daf-2b9a-4069-9082-dcfa081345aa-1.mq.us-east-1.amazonaws.com:5671",
-                    "stomp+ssl://b-200c9daf-2b9a-4069-9082-dcfa081345aa-1.mq.us-east-1.amazonaws.com:61614",
-                    "mqtt+ssl://b-200c9daf-2b9a-4069-9082-dcfa081345aa-1.mq.us-east-1.amazonaws.com:8883",
-                    "wss://b-200c9daf-2b9a-4069-9082-dcfa081345aa-1.mq.us-east-1.amazonaws.com:61619"
+                    "ssl://b--a0f75899ac20-1.mq.us-east-1.amazonaws.com:61617",
+                    "amqp+ssl://b--a0f75899ac20-1.mq.us-east-1.amazonaws.com:5671",
+                    "stomp+ssl://b--a0f75899ac20-1.mq.us-east-1.amazonaws.com:61614",
+                    "mqtt+ssl://b--a0f75899ac20-1.mq.us-east-1.amazonaws.com:8883",
+                    "wss://b--a0f75899ac20-1.mq.us-east-1.amazonaws.com:61619"
                 ],
-                "IpAddress": "172.31.95.148"
+                "IpAddress": "172.31.85.165"
             }
         ],
         "BrokerName": "mq-broker-active-434-green",
         "BrokerState": "RUNNING",
         "Configurations": {
             "Current": {
-                "Id": "c-476c90cf-f499-4bd1-b499-62a064d3de0e",
+                "Id": "c-9ade-46c2-81a6-e4faf101c945",
                 "Revision": 1
             },
             "History": []
@@ -31,38 +31,38 @@
         "Created": {
             "__class__": "datetime",
             "year": 2024,
-            "month": 5,
-            "day": 19,
-            "hour": 19,
-            "minute": 50,
-            "second": 20,
-            "microsecond": 66000
+            "month": 11,
+            "day": 11,
+            "hour": 12,
+            "minute": 2,
+            "second": 42,
+            "microsecond": 955457
         },
         "DeploymentMode": "SINGLE_INSTANCE",
         "EncryptionOptions": {
             "UseAwsOwnedKey": true
         },
         "EngineType": "ActiveMQ",
-        "EngineVersion": "5.17.6",
+        "EngineVersion": "5.18.4",
         "HostInstanceType": "mq.t2.micro",
         "Logs": {
             "Audit": false,
-            "AuditLogGroup": "/aws/amazonmq/broker/b-200c9daf-2b9a-4069-9082-dcfa081345aa/audit",
+            "AuditLogGroup": "/aws/amazonmq/broker/b--a0f75899ac20/audit",
             "General": false,
-            "GeneralLogGroup": "/aws/amazonmq/broker/b-200c9daf-2b9a-4069-9082-dcfa081345aa/general"
+            "GeneralLogGroup": "/aws/amazonmq/broker/b--a0f75899ac20/general"
         },
         "MaintenanceWindowStartTime": {
             "DayOfWeek": "MONDAY",
-            "TimeOfDay": "20:00",
+            "TimeOfDay": "21:00",
             "TimeZone": "UTC"
         },
         "PubliclyAccessible": false,
         "SecurityGroups": [
-            "sg-tbtttt"
+            "sg-111111"
         ],
         "StorageType": "efs",
         "SubnetIds": [
-            "subnet-cd7athff8ec"
+            "subnet-1111111"
         ],
         "Tags": {
             "CustodianRule": "ecc-aws-434-mq_broker_latest_version",
diff --git a/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.DescribeBroker_2.json b/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.DescribeBroker_2.json
index 778bc9f6b..ca569ab84 100644
--- a/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.DescribeBroker_2.json
+++ b/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.DescribeBroker_2.json
@@ -3,14 +3,14 @@
     "data": {
         "ResponseMetadata": {},
         "AuthenticationStrategy": "simple",
-        "AutoMinorVersionUpgrade": false,
-        "BrokerArn": "arn:aws:mq:us-east-1:111111111111:broker:mq-broker-rabbit-434-green:b-86170a63-a56e-4e1e-9001-8cb46c4fe33f",
-        "BrokerId": "b-86170a63-a56e-4e1e-9001-8cb46c4fe33f",
+        "AutoMinorVersionUpgrade": true,
+        "BrokerArn": "arn:aws:mq:us-east-1:644160558196:broker:mq-broker-rabbit-434-green:b-91ad-e1dded61024d",
+        "BrokerId": "b-91ad-e1dded61024d",
         "BrokerInstances": [
             {
-                "ConsoleURL": "https://b-86170a63-a56e-4e1e-9001-8cb46c4fe33f.mq.us-east-1.amazonaws.com",
+                "ConsoleURL": "https://b-91ad-e1dded61024d.mq.us-east-1.amazonaws.com",
                 "Endpoints": [
-                    "amqps://b-86170a63-a56e-4e1e-9001-8cb46c4fe33f.mq.us-east-1.amazonaws.com:5671"
+                    "amqps://b-91ad-e1dded61024d.mq.us-east-1.amazonaws.com:5671"
                 ]
             }
         ],
@@ -18,7 +18,7 @@
         "BrokerState": "RUNNING",
         "Configurations": {
             "Current": {
-                "Id": "c-9abc4c54-2583-4669-826e-c79270883c6c",
+                "Id": "c-f56d9f32-17fe-4c96-a4da-8ab927adcbb9",
                 "Revision": 1
             },
             "History": []
@@ -26,27 +26,27 @@
         "Created": {
             "__class__": "datetime",
             "year": 2024,
-            "month": 5,
-            "day": 19,
-            "hour": 19,
-            "minute": 42,
-            "second": 11,
-            "microsecond": 227000
+            "month": 11,
+            "day": 11,
+            "hour": 12,
+            "minute": 2,
+            "second": 41,
+            "microsecond": 845960
         },
         "DeploymentMode": "SINGLE_INSTANCE",
         "EncryptionOptions": {
             "UseAwsOwnedKey": true
         },
         "EngineType": "RabbitMQ",
-        "EngineVersion": "3.12.13",
+        "EngineVersion": "3.13.6",
         "HostInstanceType": "mq.t3.micro",
         "Logs": {
             "General": false,
-            "GeneralLogGroup": "/aws/amazonmq/broker/b-86170a63-a56e-4e1e-9001-8cb46c4fe33f/general"
+            "GeneralLogGroup": "/aws/amazonmq/broker/b-91ad-e1dded61024d/general"
         },
         "MaintenanceWindowStartTime": {
-            "DayOfWeek": "TUESDAY",
-            "TimeOfDay": "17:00",
+            "DayOfWeek": "THURSDAY",
+            "TimeOfDay": "20:00",
             "TimeZone": "UTC"
         },
         "PubliclyAccessible": true,
diff --git a/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.ListBrokers_1.json b/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.ListBrokers_1.json
index baa196290..fad991c53 100644
--- a/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.ListBrokers_1.json
+++ b/tests/ecc-aws-434-mq_broker_latest_version/placebo-green/mq.ListBrokers_1.json
@@ -4,38 +4,38 @@
         "ResponseMetadata": {},
         "BrokerSummaries": [
             {
-                "BrokerArn": "arn:aws:mq:us-east-1:111111111111:broker:mq-broker-active-434-green:b-200c9daf-2b9a-4069-9082-dcfa081345aa",
-                "BrokerId": "b-200c9daf-2b9a-4069-9082-dcfa081345aa",
+                "BrokerArn": "arn:aws:mq:us-east-1:644160558196:broker:mq-broker-active-434-green:b-096a2262-c87f-461a-9e17-a0f75899ac20",
+                "BrokerId": "b-096a2262-c87f-461a-9e17-a0f75899ac20",
                 "BrokerName": "mq-broker-active-434-green",
                 "BrokerState": "RUNNING",
                 "Created": {
                     "__class__": "datetime",
                     "year": 2024,
-                    "month": 5,
-                    "day": 19,
-                    "hour": 19,
-                    "minute": 50,
-                    "second": 20,
-                    "microsecond": 66000
+                    "month": 11,
+                    "day": 11,
+                    "hour": 12,
+                    "minute": 2,
+                    "second": 42,
+                    "microsecond": 955457
                 },
                 "DeploymentMode": "SINGLE_INSTANCE",
                 "EngineType": "ActiveMQ",
                 "HostInstanceType": "mq.t2.micro"
             },
             {
-                "BrokerArn": "arn:aws:mq:us-east-1:111111111111:broker:mq-broker-rabbit-434-green:b-86170a63-a56e-4e1e-9001-8cb46c4fe33f",
-                "BrokerId": "b-86170a63-a56e-4e1e-9001-8cb46c4fe33f",
+                "BrokerArn": "arn:aws:mq:us-east-1:644160558196:broker:mq-broker-rabbit-434-green:b-7bf2f8b1-58a7-4006-91ad-e1dded61024d",
+                "BrokerId": "b-7bf2f8b1-58a7-4006-91ad-e1dded61024d",
                 "BrokerName": "mq-broker-rabbit-434-green",
                 "BrokerState": "RUNNING",
                 "Created": {
                     "__class__": "datetime",
                     "year": 2024,
-                    "month": 5,
-                    "day": 19,
-                    "hour": 19,
-                    "minute": 42,
-                    "second": 11,
-                    "microsecond": 227000
+                    "month": 11,
+                    "day": 11,
+                    "hour": 12,
+                    "minute": 2,
+                    "second": 41,
+                    "microsecond": 845960
                 },
                 "DeploymentMode": "SINGLE_INSTANCE",
                 "EngineType": "RabbitMQ",
diff --git a/tests/ecc-aws-434-mq_broker_latest_version/placebo-red/mq.DescribeBroker_1.json b/tests/ecc-aws-434-mq_broker_latest_version/placebo-red/mq.DescribeBroker_1.json
index b09125b3d..6976cd87d 100644
--- a/tests/ecc-aws-434-mq_broker_latest_version/placebo-red/mq.DescribeBroker_1.json
+++ b/tests/ecc-aws-434-mq_broker_latest_version/placebo-red/mq.DescribeBroker_1.json
@@ -1,57 +1,64 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "AuthenticationStrategy": "simple",
-        "AutoMinorVersionUpgrade": false,
-        "BrokerArn": "arn:aws:mq:us-east-1:111111111111:broker:mq-broker-rabbit-434-red:b-3147bbc4-8ebd-4bbe-b2d6-286249deeec2",
-        "BrokerId": "b-3147bbc4-8ebd-4bbe-b2d6-286249deeec2",
-        "BrokerInstances": [
-            {
-                "ConsoleURL": "https://b-3147bbc4-8ebd-4bbe-b2d6-286249deeec2.mq.us-east-1.amazonaws.com",
-                "Endpoints": [
-                    "amqps://b-3147bbc4-8ebd-4bbe-b2d6-286249deeec2.mq.us-east-1.amazonaws.com:5671"
-                ]
-            }
-        ],
-        "BrokerName": "mq-broker-rabbit-434-red",
-        "BrokerState": "RUNNING",
-        "Created": {
-            "__class__": "datetime",
-            "year": 2022,
-            "month": 7,
-            "day": 4,
-            "hour": 9,
-            "minute": 3,
-            "second": 22,
-            "microsecond": 69000
-        },
-        "DeploymentMode": "SINGLE_INSTANCE",
-        "EncryptionOptions": {
-            "UseAwsOwnedKey": true
-        },
-        "EngineType": "RabbitMQ",
-        "EngineVersion": "3.8.30",
-        "HostInstanceType": "mq.t3.micro",
-        "Logs": {
-            "General": false,
-            "GeneralLogGroup": "/aws/amazonmq/broker/b-3147bbc4-8ebd-4bbe-b2d6-286249deeec2/general"
-        },
-        "MaintenanceWindowStartTime": {
-            "DayOfWeek": "MONDAY",
-            "TimeOfDay": "17:00",
-            "TimeZone": "UTC"
-        },
-        "PubliclyAccessible": true,
-        "SecurityGroups": [],
-        "StorageType": "ebs",
-        "SubnetIds": [
-            "subnet-247c052a"
-        ],
-        "Tags": {
-            "CustodianRule": "ecc-aws-434-mq_brocker_latest_version",
-            "ComplianceStatus": "Red"
-        },
-        "Users": []
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "AuthenticationStrategy": "simple",
+        "AutoMinorVersionUpgrade": false,
+        "BrokerArn": "arn:aws:mq:us-east-1:644160558196:broker:mq-broker-rabbit-434-red:bbb15-ab9ff7bdd1ec",
+        "BrokerId": "bbb15-ab9ff7bdd1ec",
+        "BrokerInstances": [
+            {
+                "ConsoleURL": "https://bbb15-ab9ff7bdd1ec.mq.us-east-1.amazonaws.com",
+                "Endpoints": [
+                    "amqps://bbb15-ab9ff7bdd1ec.mq.us-east-1.amazonaws.com:5671"
+                ]
+            }
+        ],
+        "BrokerName": "mq-broker-rabbit-434-red",
+        "BrokerState": "RUNNING",
+        "Configurations": {
+            "Current": {
+                "Id": "c-5d409df8-8fc1-4e34-b5aa-a2a4b15f1210",
+                "Revision": 1
+            },
+            "History": []
+        },
+        "Created": {
+            "__class__": "datetime",
+            "year": 2024,
+            "month": 11,
+            "day": 11,
+            "hour": 12,
+            "minute": 2,
+            "second": 35,
+            "microsecond": 639111
+        },
+        "DeploymentMode": "SINGLE_INSTANCE",
+        "EncryptionOptions": {
+            "UseAwsOwnedKey": true
+        },
+        "EngineType": "RabbitMQ",
+        "EngineVersion": "3.11.28",
+        "HostInstanceType": "mq.t3.micro",
+        "Logs": {
+            "General": false,
+            "GeneralLogGroup": "/aws/amazonmq/broker/bbb15-ab9ff7bdd1ec/general"
+        },
+        "MaintenanceWindowStartTime": {
+            "DayOfWeek": "THURSDAY",
+            "TimeOfDay": "17:00",
+            "TimeZone": "UTC"
+        },
+        "PubliclyAccessible": true,
+        "SecurityGroups": [],
+        "StorageType": "ebs",
+        "SubnetIds": [
+            "subnet-thtgs827"
+        ],
+        "Tags": {
+            "CustodianRule": "ecc-aws-434-mq_broker_latest_version",
+            "ComplianceStatus": "Red"
+        },
+        "Users": []
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-434-mq_broker_latest_version/placebo-red/mq.ListBrokers_1.json b/tests/ecc-aws-434-mq_broker_latest_version/placebo-red/mq.ListBrokers_1.json
index 63be37575..fbce4c644 100644
--- a/tests/ecc-aws-434-mq_broker_latest_version/placebo-red/mq.ListBrokers_1.json
+++ b/tests/ecc-aws-434-mq_broker_latest_version/placebo-red/mq.ListBrokers_1.json
@@ -1,27 +1,27 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "BrokerSummaries": [
-            {
-                "BrokerArn": "arn:aws:mq:us-east-1:111111111111:broker:mq-broker-rabbit-434-red:b-3147bbc4-8ebd-4bbe-b2d6-286249deeec2",
-                "BrokerId": "b-3147bbc4-8ebd-4bbe-b2d6-286249deeec2",
-                "BrokerName": "mq-broker-rabbit-434-red",
-                "BrokerState": "RUNNING",
-                "Created": {
-                    "__class__": "datetime",
-                    "year": 2022,
-                    "month": 7,
-                    "day": 4,
-                    "hour": 9,
-                    "minute": 3,
-                    "second": 22,
-                    "microsecond": 69000
-                },
-                "DeploymentMode": "SINGLE_INSTANCE",
-                "EngineType": "RabbitMQ",
-                "HostInstanceType": "mq.t3.micro"
-            }
-        ]
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "BrokerSummaries": [
+            {
+                "BrokerArn": "arn:aws:mq:us-east-1:644160558196:broker:mq-broker-rabbit-434-red:b-ef5d7457-a11c-43a9-bb15-ab9ff7bdd1ec",
+                "BrokerId": "b-ef5d7457-a11c-43a9-bb15-ab9ff7bdd1ec",
+                "BrokerName": "mq-broker-rabbit-434-red",
+                "BrokerState": "RUNNING",
+                "Created": {
+                    "__class__": "datetime",
+                    "year": 2024,
+                    "month": 11,
+                    "day": 11,
+                    "hour": 12,
+                    "minute": 2,
+                    "second": 35,
+                    "microsecond": 639111
+                },
+                "DeploymentMode": "SINGLE_INSTANCE",
+                "EngineType": "RabbitMQ",
+                "HostInstanceType": "mq.t3.micro"
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-434-mq_broker_latest_version/red_policy_test.py b/tests/ecc-aws-434-mq_broker_latest_version/red_policy_test.py
index 480c60473..2fa34acc0 100644
--- a/tests/ecc-aws-434-mq_broker_latest_version/red_policy_test.py
+++ b/tests/ecc-aws-434-mq_broker_latest_version/red_policy_test.py
@@ -3,4 +3,4 @@ class PolicyTest(object):
     def test_resources(self, base_test, resources):
         base_test.assertEqual(len(resources), 1)
         base_test.assertEqual(resources[0]['EngineType'], 'RabbitMQ')
-        base_test.assertEqual(resources[0]['EngineVersion'], '3.8.30')
\ No newline at end of file
+        base_test.assertNotRegex(resources[0]['EngineVersion'], '3.13.*')
\ No newline at end of file
diff --git a/tests/ecc-aws-461-lambda_latest_runtime_environment_version/placebo-red/lambda.ListFunctions_1.json b/tests/ecc-aws-461-lambda_latest_runtime_environment_version/placebo-red/lambda.ListFunctions_1.json
index a589720a0..325a2c635 100644
--- a/tests/ecc-aws-461-lambda_latest_runtime_environment_version/placebo-red/lambda.ListFunctions_1.json
+++ b/tests/ecc-aws-461-lambda_latest_runtime_environment_version/placebo-red/lambda.ListFunctions_1.json
@@ -6,7 +6,7 @@
             {
                 "FunctionName": "461_lambda_red",
                 "FunctionArn": "arn:aws:lambda:us-east-1:111111111111:function:461_lambda_red",
-                "Runtime": "python3.8",
+                "Runtime": "python3.11",
                 "Role": "arn:aws:iam::111111111111:role/461_role_red",
                 "Handler": "func.py",
                 "CodeSize": 299,
diff --git a/tests/ecc-aws-461-lambda_latest_runtime_environment_version/red_policy_test.py b/tests/ecc-aws-461-lambda_latest_runtime_environment_version/red_policy_test.py
index 410ff3e21..376d3bd0c 100644
--- a/tests/ecc-aws-461-lambda_latest_runtime_environment_version/red_policy_test.py
+++ b/tests/ecc-aws-461-lambda_latest_runtime_environment_version/red_policy_test.py
@@ -2,4 +2,4 @@ class PolicyTest(object):
 
      def test_resources(self, base_test, resources):
         base_test.assertEqual(len(resources), 1)
-        base_test.assertEqual(resources[0]['Runtime'], 'python3.8')
\ No newline at end of file
+        base_test.assertNotRegex(resources[0]['Runtime'], '(nodejs20\.x|python3\.12|java21|provided\.al2023|dotnet8|ruby3\.3)')
\ No newline at end of file
diff --git a/tests/ecc-aws-497-eks_cluster_oldest_supported_version/red_policy_test.py b/tests/ecc-aws-497-eks_cluster_oldest_supported_version/red_policy_test.py
index 79fbe6be3..05c427abe 100644
--- a/tests/ecc-aws-497-eks_cluster_oldest_supported_version/red_policy_test.py
+++ b/tests/ecc-aws-497-eks_cluster_oldest_supported_version/red_policy_test.py
@@ -2,4 +2,4 @@ class PolicyTest(object):
 
     def test_resources(self, base_test, resources):
         base_test.assertEqual(len(resources), 1)
-        base_test.assertEqual(resources[0]['version'], "1.20")
\ No newline at end of file
+        base_test.assertLess(resources[0]['version'], "1.28")
\ No newline at end of file
diff --git a/tests/ecc-aws-508-mwaa_latest_version/placebo-green/airflow.GetEnvironment_1.json b/tests/ecc-aws-508-mwaa_latest_version/placebo-green/airflow.GetEnvironment_1.json
index 53db628ee..9dc54d352 100644
--- a/tests/ecc-aws-508-mwaa_latest_version/placebo-green/airflow.GetEnvironment_1.json
+++ b/tests/ecc-aws-508-mwaa_latest_version/placebo-green/airflow.GetEnvironment_1.json
@@ -1,86 +1,88 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "Environment": {
-            "AirflowConfigurationOptions": {
-                "core.default_task_retries": "16",
-                "core.parallelism": "1"
-            },
-            "AirflowVersion": "2.9.2",
-            "Arn": "arn:aws:airflow:us-east-1:111111111111:environment/mwaa_508_green",
-            "CreatedAt": {
-                "__class__": "datetime",
-                "year": 2023,
-                "month": 3,
-                "day": 1,
-                "hour": 16,
-                "minute": 6,
-                "second": 25,
-                "microsecond": 0
-            },
-            "DagS3Path": "dags/",
-            "EnvironmentClass": "mw1.small",
-            "ExecutionRoleArn": "arn:aws:iam::111111111111:role/508_role_green",
-            "LastUpdate": {
-                "CreatedAt": {
-                    "__class__": "datetime",
-                    "year": 2023,
-                    "month": 3,
-                    "day": 1,
-                    "hour": 16,
-                    "minute": 6,
-                    "second": 25,
-                    "microsecond": 0
-                },
-                "Status": "SUCCESS"
-            },
-            "LoggingConfiguration": {
-                "DagProcessingLogs": {
-                    "Enabled": false,
-                    "LogLevel": "INFO"
-                },
-                "SchedulerLogs": {
-                    "Enabled": false,
-                    "LogLevel": "INFO"
-                },
-                "TaskLogs": {
-                    "CloudWatchLogGroupArn": "arn:aws:logs:us-east-1:111111111111:log-group:airflow-mwaa_508_green-Task",
-                    "Enabled": true,
-                    "LogLevel": "INFO"
-                },
-                "WebserverLogs": {
-                    "Enabled": false,
-                    "LogLevel": "INFO"
-                },
-                "WorkerLogs": {
-                    "Enabled": false,
-                    "LogLevel": "INFO"
-                }
-            },
-            "MaxWorkers": 1,
-            "MinWorkers": 1,
-            "Name": "mwaa_508_green",
-            "NetworkConfiguration": {
-                "SecurityGroupIds": [
-                    "sg-0560bf89e35612bed"
-                ],
-                "SubnetIds": [
-                    "subnet-0542ff75e1d2fb439",
-                    "subnet-08ab2aa2fb79dd63e"
-                ]
-            },
-            "Schedulers": 2,
-            "ServiceRoleArn": "arn:aws:iam::111111111111:role/aws-service-role/airflow.amazonaws.com/AWSServiceRoleForAmazonMWAA",
-            "SourceBucketArn": "arn:aws:s3:::508-bucket-green",
-            "Status": "AVAILABLE",
-            "Tags": {
-                "CustodianRule": "ecc-aws-508-mwaa_latest_version",
-                "ComplianceStatus": "Green"
-            },
-            "WebserverAccessMode": "PRIVATE_ONLY",
-            "WebserverUrl": "fbac2178-7eda-4b2a-a1ae-2a5824e7f420-vpce.c3.us-east-1.airflow.amazonaws.com",
-            "WeeklyMaintenanceWindowStart": "MON:12:00"
-        }
-    }
-}
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "Environment": {
+            "Name": "mwaa_508_green",
+            "Status": "AVAILABLE",
+            "Arn": "arn:aws:airflow:us-east-1:644160558196:environment/mwaa_508_green",
+            "CreatedAt": {
+                "__class__": "datetime",
+                "year": 2024,
+                "month": 11,
+                "day": 11,
+                "hour": 18,
+                "minute": 36,
+                "second": 7,
+                "microsecond": 0
+            },
+            "WebserverUrl": "aa7030fe-8d4df4-vpce.c75.us-east-1.airflow.amazonaws.com",
+            "ExecutionRoleArn": "arn:aws:iam::644160558196:role/508_role_green",
+            "ServiceRoleArn": "arn:aws:iam::644160558196:role/aws-service-role/airflow.amazonaws.com/AWSServiceRoleForAmazonMWAA",
+            "AirflowVersion": "2.10.1",
+            "SourceBucketArn": "arn:aws:s3:::508-bucket-7691070-green",
+            "DagS3Path": "dags/",
+            "EnvironmentClass": "mw1.small",
+            "MaxWorkers": 1,
+            "NetworkConfiguration": {
+                "SubnetIds": [
+                    "subnet-111",
+                    "subnet-11111111"
+                ],
+                "SecurityGroupIds": [
+                    "sg-11111111111"
+                ]
+            },
+            "LoggingConfiguration": {
+                "DagProcessingLogs": {
+                    "Enabled": false,
+                    "LogLevel": "INFO"
+                },
+                "SchedulerLogs": {
+                    "Enabled": false,
+                    "LogLevel": "INFO"
+                },
+                "WebserverLogs": {
+                    "Enabled": false,
+                    "LogLevel": "INFO"
+                },
+                "WorkerLogs": {
+                    "Enabled": false,
+                    "LogLevel": "INFO"
+                },
+                "TaskLogs": {
+                    "Enabled": true,
+                    "LogLevel": "INFO",
+                    "CloudWatchLogGroupArn": "arn:aws:logs:us-east-1:644160558196:log-group:airflow-mwaa_508_green-Task"
+                }
+            },
+            "LastUpdate": {
+                "Status": "SUCCESS",
+                "CreatedAt": {
+                    "__class__": "datetime",
+                    "year": 2024,
+                    "month": 11,
+                    "day": 11,
+                    "hour": 18,
+                    "minute": 36,
+                    "second": 7,
+                    "microsecond": 0
+                }
+            },
+            "WeeklyMaintenanceWindowStart": "SUN:04:00",
+            "Tags": {
+                "CustodianRule": "ecc-aws-508-mwaa_latest_version",
+                "ComplianceStatus": "Green"
+            },
+            "WebserverAccessMode": "PRIVATE_ONLY",
+            "MinWorkers": 1,
+            "Schedulers": 2,
+            "WebserverVpcEndpointService": "com.amazonaws.vpce.us-east-1.vpce-svc-111111111",
+            "DatabaseVpcEndpointService": "com.amazonaws.vpce.us-east-1.vpce-svc-111111111111",
+            "CeleryExecutorQueue": "arn:aws:sqs:us-east-1:644160558196:airflow-celery-",
+            "EndpointManagement": "SERVICE",
+            "MinWebservers": 2,
+            "MaxWebservers": 2
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/ecc-aws-508-mwaa_latest_version/placebo-green/airflow.ListEnvironments_1.json b/tests/ecc-aws-508-mwaa_latest_version/placebo-green/airflow.ListEnvironments_1.json
index f0240a08d..5f9510452 100644
--- a/tests/ecc-aws-508-mwaa_latest_version/placebo-green/airflow.ListEnvironments_1.json
+++ b/tests/ecc-aws-508-mwaa_latest_version/placebo-green/airflow.ListEnvironments_1.json
@@ -1,9 +1,9 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "Environments": [
-            "mwaa_508_green"
-        ]
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "Environments": [
+            "mwaa_508_green"
+        ]
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-508-mwaa_latest_version/placebo-red/airflow.GetEnvironment_1.json b/tests/ecc-aws-508-mwaa_latest_version/placebo-red/airflow.GetEnvironment_1.json
index 57965db61..10ac8b176 100644
--- a/tests/ecc-aws-508-mwaa_latest_version/placebo-red/airflow.GetEnvironment_1.json
+++ b/tests/ecc-aws-508-mwaa_latest_version/placebo-red/airflow.GetEnvironment_1.json
@@ -1,86 +1,88 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "Environment": {
-            "AirflowConfigurationOptions": {
-                "core.default_task_retries": "16",
-                "core.parallelism": "1"
-            },
-            "AirflowVersion": "2.7.2",
-            "Arn": "arn:aws:airflow:us-east-1:111111111111:environment/mwaa_508_red",
-            "CreatedAt": {
-                "__class__": "datetime",
-                "year": 2022,
-                "month": 7,
-                "day": 26,
-                "hour": 8,
-                "minute": 2,
-                "second": 4,
-                "microsecond": 0
-            },
-            "DagS3Path": "dags/",
-            "EnvironmentClass": "mw1.small",
-            "ExecutionRoleArn": "arn:aws:iam::111111111111:role/508_role_red",
-            "LastUpdate": {
-                "CreatedAt": {
-                    "__class__": "datetime",
-                    "year": 2022,
-                    "month": 7,
-                    "day": 26,
-                    "hour": 8,
-                    "minute": 2,
-                    "second": 4,
-                    "microsecond": 0
-                },
-                "Status": "SUCCESS"
-            },
-            "LoggingConfiguration": {
-                "DagProcessingLogs": {
-                    "Enabled": false,
-                    "LogLevel": "INFO"
-                },
-                "SchedulerLogs": {
-                    "Enabled": false,
-                    "LogLevel": "INFO"
-                },
-                "TaskLogs": {
-                    "CloudWatchLogGroupArn": "arn:aws:logs:us-east-1:111111111111:log-group:airflow-mwaa_508_red-Task",
-                    "Enabled": true,
-                    "LogLevel": "INFO"
-                },
-                "WebserverLogs": {
-                    "Enabled": false,
-                    "LogLevel": "INFO"
-                },
-                "WorkerLogs": {
-                    "Enabled": false,
-                    "LogLevel": "INFO"
-                }
-            },
-            "MaxWorkers": 1,
-            "MinWorkers": 1,
-            "Name": "mwaa_508_red",
-            "NetworkConfiguration": {
-                "SecurityGroupIds": [
-                    "sg-017a210f6ba04013d"
-                ],
-                "SubnetIds": [
-                    "subnet-05ec904bc017cd5ae",
-                    "subnet-0b8f6fc77c91daefd"
-                ]
-            },
-            "Schedulers": 2,
-            "ServiceRoleArn": "arn:aws:iam::111111111111:role/aws-service-role/airflow.amazonaws.com/AWSServiceRoleForAmazonMWAA",
-            "SourceBucketArn": "arn:aws:s3:::508-bucket-red",
-            "Status": "AVAILABLE",
-            "Tags": {
-                "CustodianRule": "ecc-aws-508-mwaa_latest_version",
-                "ComplianceStatus": "Red"
-            },
-            "WebserverAccessMode": "PRIVATE_ONLY",
-            "WebserverUrl": "c18882a7-c9e4-4757-b435-9f36afab5e43-vpce.c59.us-east-1.airflow.amazonaws.com",
-            "WeeklyMaintenanceWindowStart": "WED:09:00"
-        }
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "Environment": {
+            "Name": "mwaa_508_red",
+            "Status": "AVAILABLE",
+            "Arn": "arn:aws:airflow:us-east-1:644160558196:environment/mwaa_508_red",
+            "CreatedAt": {
+                "__class__": "datetime",
+                "year": 2024,
+                "month": 11,
+                "day": 11,
+                "hour": 18,
+                "minute": 26,
+                "second": 47,
+                "microsecond": 0
+            },
+            "WebserverUrl": "vpce.c66.us-east-1.airflow.amazonaws.com",
+            "ExecutionRoleArn": "arn:aws:iam::644160558196:role/508_role_red",
+            "ServiceRoleArn": "arn:aws:iam::644160558196:role/aws-service-role/airflow.amazonaws.com/AWSServiceRoleForAmazonMWAA",
+            "AirflowVersion": "2.8.1",
+            "SourceBucketArn": "arn:aws:s3:::508-bucket-8414316-red",
+            "DagS3Path": "dags/",
+            "EnvironmentClass": "mw1.small",
+            "MaxWorkers": 1,
+            "NetworkConfiguration": {
+                "SubnetIds": [
+                    "subnet-1111111",
+                    "subnet-1111111111"
+                ],
+                "SecurityGroupIds": [
+                    "sg-1111111111"
+                ]
+            },
+            "LoggingConfiguration": {
+                "DagProcessingLogs": {
+                    "Enabled": false,
+                    "LogLevel": "INFO"
+                },
+                "SchedulerLogs": {
+                    "Enabled": false,
+                    "LogLevel": "INFO"
+                },
+                "WebserverLogs": {
+                    "Enabled": false,
+                    "LogLevel": "INFO"
+                },
+                "WorkerLogs": {
+                    "Enabled": false,
+                    "LogLevel": "INFO"
+                },
+                "TaskLogs": {
+                    "Enabled": true,
+                    "LogLevel": "INFO",
+                    "CloudWatchLogGroupArn": "arn:aws:logs:us-east-1:644160558196:log-group:airflow-mwaa_508_red-Task"
+                }
+            },
+            "LastUpdate": {
+                "Status": "SUCCESS",
+                "CreatedAt": {
+                    "__class__": "datetime",
+                    "year": 2024,
+                    "month": 11,
+                    "day": 11,
+                    "hour": 18,
+                    "minute": 26,
+                    "second": 47,
+                    "microsecond": 0
+                }
+            },
+            "WeeklyMaintenanceWindowStart": "TUE:04:30",
+            "Tags": {
+                "CustodianRule": "ecc-aws-508-mwaa_latest_version",
+                "ComplianceStatus": "Red"
+            },
+            "WebserverAccessMode": "PRIVATE_ONLY",
+            "MinWorkers": 1,
+            "Schedulers": 2,
+            "WebserverVpcEndpointService": "com.amazonaws.vpce.us-east-1.vpce-svc",
+            "DatabaseVpcEndpointService": "com.amazonaws.vpce.us-east-1.vpce-svc",
+            "CeleryExecutorQueue": "arn:aws:sqs:us-east-1:644160558196:airflow-celery",
+            "EndpointManagement": "SERVICE",
+            "MinWebservers": 2,
+            "MaxWebservers": 2
+        }
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-508-mwaa_latest_version/placebo-red/airflow.ListEnvironments_1.json b/tests/ecc-aws-508-mwaa_latest_version/placebo-red/airflow.ListEnvironments_1.json
index 528bdaccd..ea21b55c7 100644
--- a/tests/ecc-aws-508-mwaa_latest_version/placebo-red/airflow.ListEnvironments_1.json
+++ b/tests/ecc-aws-508-mwaa_latest_version/placebo-red/airflow.ListEnvironments_1.json
@@ -1,9 +1,9 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {},
-        "Environments": [
-            "mwaa_508_red"
-        ]
-    }
+{
+    "status_code": 200,
+    "data": {
+        "ResponseMetadata": {},
+        "Environments": [
+            "mwaa_508_red"
+        ]
+    }
 }
\ No newline at end of file
diff --git a/tests/ecc-aws-508-mwaa_latest_version/red_policy_test.py b/tests/ecc-aws-508-mwaa_latest_version/red_policy_test.py
index c4ae5139a..21a2d24b9 100644
--- a/tests/ecc-aws-508-mwaa_latest_version/red_policy_test.py
+++ b/tests/ecc-aws-508-mwaa_latest_version/red_policy_test.py
@@ -2,4 +2,4 @@ class PolicyTest(object):
 
      def test_resources(self, base_test, resources):
         base_test.assertEqual(len(resources), 1)
-        base_test.assertNotEqual(resources[0]['AirflowVersion'], '2.9.2')
\ No newline at end of file
+        base_test.assertNotEqual(resources[0]['AirflowVersion'], '2.10.1')
\ No newline at end of file
diff --git a/tests/ecc-aws-536-lambda_function_settings_check/placebo-green/lambda.ListFunctions_1.json b/tests/ecc-aws-536-lambda_function_settings_check/placebo-green/lambda.ListFunctions_1.json
index 44f1b52f9..1945753aa 100644
--- a/tests/ecc-aws-536-lambda_function_settings_check/placebo-green/lambda.ListFunctions_1.json
+++ b/tests/ecc-aws-536-lambda_function_settings_check/placebo-green/lambda.ListFunctions_1.json
@@ -6,7 +6,7 @@
             {
                 "FunctionName": "536_lambda_green",
                 "FunctionArn": "arn:aws:lambda:us-east-1:111111111111:function:536_lambda_green",
-                "Runtime": "python3.8",
+                "Runtime": "python3.12",
                 "Role": "arn:aws:iam::111111111111:role/536_role_green",
                 "Handler": "func.py",
                 "CodeSize": 299,
diff --git a/tests/ecc-aws-536-lambda_function_settings_check/red_policy_test.py b/tests/ecc-aws-536-lambda_function_settings_check/red_policy_test.py
index 00571d6eb..309963a1b 100644
--- a/tests/ecc-aws-536-lambda_function_settings_check/red_policy_test.py
+++ b/tests/ecc-aws-536-lambda_function_settings_check/red_policy_test.py
@@ -2,5 +2,4 @@ class PolicyTest(object):
 
     def test_resources(self, base_test, resources):
         base_test.assertEqual(len(resources), 1)
-        print(resources[0]['Runtime'])
-        base_test.assertEqual(resources[0]['Runtime'], "python2.7")
+        base_test.assertNotIn(resources[0]['Runtime'], ['nodejs20.x', 'nodejs18.x', 'python3.12', 'python3.11', 'python3.10', 'python3.9', 'java21', 'java17', 'java11', 'java8.al2', 'dotnet8', 'dotnet6', 'ruby3.3', 'ruby3.2', 'provided.al2023', 'provided.al2'])