diff --git a/data.tf b/data.tf
index f5e26e4c8b..ef7a17bc74 100644
--- a/data.tf
+++ b/data.tf
@@ -31,7 +31,7 @@ data "aws_iam_policy_document" "eks_key" {
       "kms:GenerateDataKey*",
       "kms:ReEncrypt*",
     ]
-    resources = ["arn:${local.context.aws_partition_id}:kms:${local.context.aws_region_name}:${local.context.aws_caller_identity_account_id}:key/*"]
+    resources = ["*"]
 
     principals {
       type = "AWS"
@@ -62,7 +62,7 @@ data "aws_iam_policy_document" "eks_key" {
       "kms:List*",
       "kms:RevokeGrant",
     ]
-    resources = ["arn:${local.context.aws_partition_id}:kms:${local.context.aws_region_name}:${local.context.aws_caller_identity_account_id}:key/*"]
+    resources = ["*"]
 
     principals {
       type = "AWS"
@@ -78,7 +78,7 @@ data "aws_iam_policy_document" "eks_key" {
     actions = [
       "kms:*"
     ]
-    resources = ["arn:${local.context.aws_partition_id}:kms:${local.context.aws_region_name}:${local.context.aws_caller_identity_account_id}:key/*"]
+    resources = ["*"]
 
     principals {
       type = "AWS"
@@ -99,7 +99,7 @@ data "aws_iam_policy_document" "eks_key" {
       "kms:GenerateDataKey*",
       "kms:ReEncrypt*",
     ]
-    resources = ["arn:${local.context.aws_partition_id}:kms:${local.context.aws_region_name}:${local.context.aws_caller_identity_account_id}:key/*"]
+    resources = ["*"]
 
     principals {
       type = "AWS"
@@ -119,7 +119,8 @@ data "aws_iam_policy_document" "eks_key" {
       "kms:ListGrants",
       "kms:RevokeGrant",
     ]
-    resources = ["arn:${local.context.aws_partition_id}:kms:${local.context.aws_region_name}:${local.context.aws_caller_identity_account_id}:key/*"]
+    resources = ["*"]
+
     principals {
       type = "AWS"
       identifiers = [
diff --git a/main.tf b/main.tf
index c324ea5ed5..97345dc662 100644
--- a/main.tf
+++ b/main.tf
@@ -19,8 +19,8 @@ module "kms" {
 }
 
 module "aws_eks" {
-  source  = "terraform-aws-modules/eks/aws"
-  version = "v18.29.1"
+  source  = "git::https://github.com/terraform-aws-modules.git?ref=32000068258828b812b3b6f76efcb2b452b810f3"
+  #version = "v18.29.1"
 
   create = var.create_eks
 
diff --git a/modules/aws-eks-fargate-profiles/main.tf b/modules/aws-eks-fargate-profiles/main.tf
index dbc26448d5..250cbb3381 100644
--- a/modules/aws-eks-fargate-profiles/main.tf
+++ b/modules/aws-eks-fargate-profiles/main.tf
@@ -74,7 +74,7 @@ data "aws_iam_policy_document" "cwlogs" {
   statement {
     sid       = ""
     effect    = "Allow"
-    resources = ["arn:aws:logs:*:*:*"]
+    resources = ["*"]
 
     actions = [
       "logs:CreateLogGroup",