diff --git a/codebuild.tf b/codebuild.tf
index fc77eec..2f526ef 100644
--- a/codebuild.tf
+++ b/codebuild.tf
@@ -60,7 +60,7 @@ data "aws_iam_policy_document" "codebuild_validate_assume" {
       test     = "StringLike"
       variable = "aws:SourceArn"
       values = [
-        "arn:aws:codebuild:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:project/${var.pipeline_name}-*"
+        "arn:aws:codebuild:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:project/${var.pipeline_name}-*"
       ]
     }
   }
@@ -78,8 +78,8 @@ data "aws_iam_policy_document" "codebuild_execution_assume" {
       test     = "StringEquals"
       variable = "aws:SourceArn"
       values = [
-        "arn:aws:codebuild:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:project/${var.pipeline_name}-plan",
-        "arn:aws:codebuild:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:project/${var.pipeline_name}-apply"
+        "arn:aws:codebuild:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:project/${var.pipeline_name}-plan",
+        "arn:aws:codebuild:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:project/${var.pipeline_name}-apply"
       ]
     }
   }
@@ -109,7 +109,7 @@ data "aws_iam_policy_document" "codebuild" {
       "logs:PutLogEvents"
     ]
     resources = [
-      "arn:aws:logs:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:log-group:*"
+      "arn:aws:logs:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:log-group:*"
     ]
   }
 
@@ -177,7 +177,7 @@ data "aws_iam_policy_document" "codebuild" {
 
       ]
       resources = [
-        "arn:aws:ec2:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:network-interface/*"
+        "arn:aws:ec2:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:network-interface/*"
       ]
       condition {
         test     = "StringEquals"
@@ -191,7 +191,7 @@ data "aws_iam_policy_document" "codebuild" {
         variable = "ec2:Subnet"
         values = [
           for id in var.vpc["subnets"] :
-          "arn:aws:ec2:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:subnet/${id}"
+          "arn:aws:ec2:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:subnet/${id}"
         ]
       }
     }
diff --git a/codepipeline.tf b/codepipeline.tf
index 9df2536..6360b6e 100644
--- a/codepipeline.tf
+++ b/codepipeline.tf
@@ -115,7 +115,7 @@ data "aws_iam_policy_document" "codepipeline-assume-role" {
       test     = "StringLike"
       variable = "aws:SourceArn"
       values = [
-        "arn:aws:codepipeline:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:${var.pipeline_name}"
+        "arn:aws:codepipeline:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:${var.pipeline_name}"
       ]
     }
   }
@@ -154,7 +154,7 @@ data "aws_iam_policy_document" "codepipeline" {
       "codebuild:StartBuild"
     ]
     resources = [
-      "arn:aws:codebuild:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:project/${var.pipeline_name}-*"
+      "arn:aws:codebuild:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:project/${var.pipeline_name}-*"
     ]
   }
 
@@ -169,7 +169,7 @@ data "aws_iam_policy_document" "codepipeline" {
       "codestar-connections:UseConnection"
     ]
     resources = [
-      var.connection == null ? "arn:aws:codecommit:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:${var.repo}" : var.connection
+      var.connection == null ? "arn:aws:codecommit:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:${var.repo}" : var.connection
     ]
   }
 }
diff --git a/eventbridge.tf b/eventbridge.tf
index acef063..b1a1e91 100644
--- a/eventbridge.tf
+++ b/eventbridge.tf
@@ -13,7 +13,7 @@ resource "aws_cloudwatch_event_rule" "this" {
       "CodeCommit Repository State Change"
     ],
     "resources" : [
-      "arn:aws:codecommit:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:${var.repo}"
+      "arn:aws:codecommit:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:${var.repo}"
     ],
     "detail" : {
       "event" : [