diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ac1aab6..f5fe91c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,6 +31,8 @@ repos:
         args:
           - --args=--exclude-downloaded-modules
       - id: terraform_checkov
+        args:
+            - --args=--skip-check CKV_TF_1
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.2.0
diff --git a/.tflint.hcl b/.tflint.hcl
index 3078f9d..fb4f3df 100644
--- a/.tflint.hcl
+++ b/.tflint.hcl
@@ -1,6 +1,6 @@
 plugin "aws" {
   enabled = true
-  version = "0.17.0"
+  version = "0.23.1"
   source  = "github.com/terraform-linters/tflint-ruleset-aws"
 }
 
diff --git a/outputs.tf b/outputs.tf
index 722c325..fa97d35 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -20,17 +20,23 @@ output "ecs_cluster_name" {
 
 output "ecs_service_arn" {
   description = "ARN of the ECS service"
-  value       = try(module.cluster.ecs_service_arn, "")
+  value = try(tomap({
+    for k, f in module.service : k => f.ecs_service_arn
+  }), "")
 }
 
 output "ecs_service_name" {
   description = "The name of the ECS service"
-  value       = try(module.cluster.ecs_service_name, "")
+  value = try(tomap({
+    for k, f in module.service : k => f.ecs_service_name
+  }), "")
 }
 
 output "aws_ecs_task_definition" {
   description = "ARN of the ECS service"
-  value       = try(module.cluster.aws_ecs_task_definition, "")
+  value = try(tomap({
+    for k, f in module.service : k => f.aws_ecs_task_definition
+  }), "")
 }
 
 output "ecs_cloudwatch_log_group_name" {