diff --git a/README.md b/README.md
index 2a8d7dc..a1120f2 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ sys     0m2.015s
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.14.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 6.0 |
 | <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.11.0 |
 | <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.23.0 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1 |
diff --git a/cert-mgr-cluster-issuer.tf b/cert-mgr-cluster-issuer.tf
index 41d8dad..ee8c466 100644
--- a/cert-mgr-cluster-issuer.tf
+++ b/cert-mgr-cluster-issuer.tf
@@ -11,7 +11,7 @@ module "subordinate_ca" {
 
   cluster_name  = var.cluster_name
   contact_email = var.cluster_mailing_list
-  validity_days = 30
+  validity_days = 365
 
   tags = merge(
     local.common_tags,
@@ -20,8 +20,7 @@ module "subordinate_ca" {
 
 resource "kubernetes_secret" "ca_key_pair" {
   metadata {
-    name = "ca-key-pair"
-    # namespace = var.cluster_issuer_name
+    name      = "ca-key-pair"
     namespace = var.namespace
   }
 
@@ -35,6 +34,7 @@ resource "helm_release" "clusterissuer" {
   name      = "clusterissuer"
   chart     = "./clusterissuer"
   namespace = var.namespace
+  atomic    = true
 
   set = [
     {
diff --git a/clusterissuer/Chart.yaml b/clusterissuer/Chart.yaml
deleted file mode 100644
index 425addf..0000000
--- a/clusterissuer/Chart.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-apiVersion: v2
-name: clusterissuer
-version: 0.1.0
diff --git a/clusterissuer/templates/clusterissuer.yaml b/clusterissuer/templates/clusterissuer.yaml
deleted file mode 100644
index ed51be9..0000000
--- a/clusterissuer/templates/clusterissuer.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: {{ .Values.apiVersion }}
-kind: ClusterIssuer
-metadata:
-  name: {{ .Values.name }}
-spec:
-  ca:
-    secretName: {{ .Values.secretName }}
diff --git a/requirements.tf b/requirements.tf
index 32e5c6f..23f9f8e 100644
--- a/requirements.tf
+++ b/requirements.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.14.0"
+      version = "~> 6.0"
     }
     helm = {
       source  = "hashicorp/helm"