diff --git a/terraform/layer2-k8s/eks-cert-manager.tf b/terraform/layer2-k8s/eks-cert-manager.tf
index f46fe406..45c1fdd9 100644
--- a/terraform/layer2-k8s/eks-cert-manager.tf
+++ b/terraform/layer2-k8s/eks-cert-manager.tf
@@ -4,7 +4,7 @@ locals {
     enabled       = local.helm_releases[index(local.helm_releases.*.id, "cert-manager")].enabled
     chart         = local.helm_releases[index(local.helm_releases.*.id, "cert-manager")].chart
     repository    = local.helm_releases[index(local.helm_releases.*.id, "cert-manager")].repository
-    chart_version = local.helm_releases[index(local.helm_releases.*.id, "cert-manager")].version
+    chart_version = local.helm_releases[index(local.helm_releases.*.id, "cert-manager")].chart_version
     namespace     = local.helm_releases[index(local.helm_releases.*.id, "cert-manager")].namespace
   }
   cert_mananger_certificate = {
@@ -12,7 +12,7 @@ locals {
     enabled       = local.helm_releases[index(local.helm_releases.*.id, "cert-mananger-certificate")].enabled
     chart         = local.helm_releases[index(local.helm_releases.*.id, "cert-mananger-certificate")].chart
     repository    = local.helm_releases[index(local.helm_releases.*.id, "cert-mananger-certificate")].repository
-    chart_version = local.helm_releases[index(local.helm_releases.*.id, "cert-mananger-certificate")].version
+    chart_version = local.helm_releases[index(local.helm_releases.*.id, "cert-mananger-certificate")].chart_version
     namespace     = local.helm_releases[index(local.helm_releases.*.id, "cert-mananger-certificate")].namespace
   }
   cert_manager_cluster_issuer = {
@@ -20,39 +20,41 @@ locals {
     enabled       = local.helm_releases[index(local.helm_releases.*.id, "cert-manager-cluster-issuer")].enabled
     chart         = local.helm_releases[index(local.helm_releases.*.id, "cert-manager-cluster-issuer")].chart
     repository    = local.helm_releases[index(local.helm_releases.*.id, "cert-manager-cluster-issuer")].repository
-    chart_version = local.helm_releases[index(local.helm_releases.*.id, "cert-manager-cluster-issuer")].version
+    chart_version = local.helm_releases[index(local.helm_releases.*.id, "cert-manager-cluster-issuer")].chart_version
     namespace     = local.helm_releases[index(local.helm_releases.*.id, "cert-manager-cluster-issuer")].namespace
   }
-}
-
-data "template_file" "cert_manager" {
-  count = local.cert_manager.enabled ? 1 : 0
-
-  template = file("${path.module}/templates/cert-manager-values.yaml")
-  vars = {
-    role_arn = module.aws_iam_cert_manager[count.index].role_arn
-  }
-}
-
-data "template_file" "cluster_issuer" {
-  count = local.cert_manager_cluster_issuer.enabled ? 1 : 0
-
-  template = file("${path.module}/templates/cluster-issuer-values.yaml")
-  vars = {
-    region  = local.region
-    zone    = local.domain_name
-    zone_id = local.zone_id
-  }
-}
-
-data "template_file" "certificate" {
-  count = local.cert_mananger_certificate.enabled ? 1 : 0
-
-  template = file("${path.module}/templates/certificate-values.yaml")
-  vars = {
-    domain_name = "*.${local.domain_name}"
-    common_name = local.domain_name
-  }
+  cert_manager_values                = <<VALUES
+installCRDs: true
+serviceAccount:
+  annotations:
+    "eks.amazonaws.com/role-arn": ${local.cert_manager.enabled ? module.aws_iam_cert_manager[0].role_arn : ""}
+securityContext:
+  fsGroup: 1001
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: eks.amazonaws.com/capacityType
+          operator: In
+          values:
+            - ON_DEMAND
+cainjector:
+  enabled: true
+  replicaCount: 1
+  extraArgs:
+    - --leader-elect=false
+VALUES
+  cert_manager_cluster_issuer_values = <<VALUES
+dnsZone: ${local.domain_name}
+dnsZoneId: ${local.zone_id}
+region: ${local.region}
+email: webmaster@${local.domain_name}
+VALUES
+  cert_mananger_certificate_values   = <<VALUES
+domainName: "*.${local.domain_name}"
+commonName: "${local.domain_name}"
+VALUES
 }
 
 #tfsec:ignore:kubernetes-network-no-public-egress tfsec:ignore:kubernetes-network-no-public-ingress
@@ -182,7 +184,7 @@ resource "helm_release" "cert_manager" {
   max_history = var.helm_release_history_size
 
   values = [
-    data.template_file.cert_manager[count.index].rendered,
+    local.cert_manager_values
   ]
 
 }
@@ -198,7 +200,7 @@ resource "helm_release" "cluster_issuer" {
   max_history = var.helm_release_history_size
 
   values = [
-    data.template_file.cluster_issuer[count.index].rendered,
+    local.cert_manager_cluster_issuer_values
   ]
 
   # This dep needs for correct apply
@@ -216,7 +218,7 @@ resource "helm_release" "certificate" {
   max_history = var.helm_release_history_size
 
   values = [
-    data.template_file.certificate[count.index].rendered,
+    local.cert_mananger_certificate_values
   ]
 
   # This dep needs for correct apply
diff --git a/terraform/layer2-k8s/helm-releases.yaml b/terraform/layer2-k8s/helm-releases.yaml
index e6006382..c8750286 100644
--- a/terraform/layer2-k8s/helm-releases.yaml
+++ b/terraform/layer2-k8s/helm-releases.yaml
@@ -21,19 +21,19 @@ releases:
     enabled: false
     chart: cert-manager
     repository: https://charts.jetstack.io
-    version: 1.1.0
+    chart_version: 1.1.0
     namespace: certmanager
   - id: cert-mananger-certificate
     enabled: false
     chart: ../../helm-charts/certificate
     repository:
-    version:
+    chart_version:
     namespace: ingress-nginx
   - id: cert-manager-cluster-issuer
     enabled: false
     chart: ../../helm-charts/cluster-issuer
     repository:
-    version:
+    chart_version:
     namespace: certmanager
   - id: cluster-autoscaler
     enabled: true
diff --git a/terraform/layer2-k8s/templates/cert-manager-values.yaml b/terraform/layer2-k8s/templates/cert-manager-values.yaml
deleted file mode 100644
index 109f6cf2..00000000
--- a/terraform/layer2-k8s/templates/cert-manager-values.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-installCRDs: true
-
-serviceAccount:
-  annotations:
-    "eks.amazonaws.com/role-arn": ${role_arn}
-
-securityContext:
-  fsGroup: 1001
-
-affinity:
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: eks.amazonaws.com/capacityType
-          operator: In
-          values:
-            - ON_DEMAND
-
-cainjector:
-  enabled: true
-  replicaCount: 1
-
-  extraArgs:
-    - --leader-elect=false
diff --git a/terraform/layer2-k8s/templates/certificate-values.yaml b/terraform/layer2-k8s/templates/certificate-values.yaml
deleted file mode 100644
index 8742d881..00000000
--- a/terraform/layer2-k8s/templates/certificate-values.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-domainName: "${domain_name}"
-commonName: "${common_name}"
diff --git a/terraform/layer2-k8s/templates/cluster-issuer-values.yaml b/terraform/layer2-k8s/templates/cluster-issuer-values.yaml
deleted file mode 100644
index 8377b770..00000000
--- a/terraform/layer2-k8s/templates/cluster-issuer-values.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-dnsZone: ${zone}
-dnsZoneId: ${zone_id}
-region: ${region}
-email: webmaster@${zone}
\ No newline at end of file