diff --git a/config/v2/config.go b/config/v2/config.go
index 8c5033aff..01728fe3f 100644
--- a/config/v2/config.go
+++ b/config/v2/config.go
@@ -260,13 +260,11 @@ type KubernetesProvider struct {
 }
 
 type HelmProvider struct {
-	CommonProvider       `yaml:",inline"`
-	ClusterComponentName *string `yaml:"cluster_component_name,omitempty"`
+	CommonProvider `yaml:",inline"`
 }
 
 type KubectlProvider struct {
-	CommonProvider       `yaml:",inline"`
-	ClusterComponentName *string `yaml:"cluster_component_name,omitempty"`
+	CommonProvider `yaml:",inline"`
 }
 
 // Backend is used to configure a terraform backend
diff --git a/config/v2/resolvers.go b/config/v2/resolvers.go
index e2481d9d2..e215780b1 100644
--- a/config/v2/resolvers.go
+++ b/config/v2/resolvers.go
@@ -659,10 +659,8 @@ func ResolveHelmProvider(commons ...Common) *HelmProvider {
 			}
 		}
 	}
-	clusterComponentName := lastNonNil(KubernetesProviderClusterComponentNameGetter, commons...)
 	if version != nil {
 		return &HelmProvider{
-			ClusterComponentName: clusterComponentName,
 			CommonProvider: CommonProvider{
 				CustomProvider: lastNonNilBool(HelmProviderCustomProviderGetter, commons...),
 				Enabled:        enabled,
@@ -701,10 +699,8 @@ func ResolveKubectlProvider(commons ...Common) *KubectlProvider {
 		}
 	}
 
-	clusterComponentName := lastNonNil(KubernetesProviderClusterComponentNameGetter, commons...)
 	if version != nil {
 		return &KubectlProvider{
-			ClusterComponentName: clusterComponentName,
 			CommonProvider: CommonProvider{
 				CustomProvider: lastNonNilBool(KubectlProviderCustomProviderGetter, commons...),
 				Enabled:        enabled,
diff --git a/templates/templates/common/kubernetes_provider.tmpl b/templates/templates/common/kubernetes_provider.tmpl
index ddd27f0e5..bdf57f05c 100644
--- a/templates/templates/common/kubernetes_provider.tmpl
+++ b/templates/templates/common/kubernetes_provider.tmpl
@@ -1,11 +1,11 @@
 {{ define "kubernetes_provider" -}}
-{{ if .ClusterComponentName -}}
+{{ if .Kubernetes.ClusterComponentName -}}
   data "aws_eks_cluster" "cluster" {
-    name = data.terraform_remote_state.{{ .ClusterComponentName }}.outputs.cluster_id
+    name = data.terraform_remote_state.{{ .Kubernetes.ClusterComponentName }}.outputs.cluster_id
   }
 
   data "aws_eks_cluster_auth" "cluster" {
-    name = data.terraform_remote_state.{{ .ClusterComponentName }}.outputs.cluster_id
+    name = data.terraform_remote_state.{{ .Kubernetes.ClusterComponentName }}.outputs.cluster_id
   }
 
 provider "kubernetes" {
@@ -13,4 +13,7 @@ provider "kubernetes" {
   cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority.0.data)
   token                  = data.aws_eks_cluster_auth.cluster.token
 }
+
+{{template "helm_provider" .Helm -}}
+{{- template "kubectl_provider" .Kubectl -}}
 {{ end }}{{ end }}
diff --git a/templates/templates/component/terraform/fogg.tf.tmpl b/templates/templates/component/terraform/fogg.tf.tmpl
index 1ff59bc7d..dda93400f 100644
--- a/templates/templates/component/terraform/fogg.tf.tmpl
+++ b/templates/templates/component/terraform/fogg.tf.tmpl
@@ -77,15 +77,7 @@ variable "TFC_PROJECT_NAME" {
 {{ end }}{{ end }}
 
 {{- if .ProviderConfiguration.Kubernetes -}}{{- if not .ProviderConfiguration.Kubernetes.CustomProvider -}}
-  {{- template "kubernetes_provider" .ProviderConfiguration.Kubernetes -}}
-{{- end -}}{{- end -}}
-
-{{- if .ProviderConfiguration.Helm -}}{{- if not .ProviderConfiguration.Helm.CustomProvider -}}
-  {{- template "helm_provider" .ProviderConfiguration.Helm -}}
-{{- end -}}{{- end -}}
-
-{{- if .ProviderConfiguration.Kubectl -}}{{- if not .ProviderConfiguration.Kubectl.CustomProvider -}}
-  {{- template "kubectl_provider" .ProviderConfiguration.Kubectl -}}
+  {{- template "kubernetes_provider" .ProviderConfiguration -}}
 {{- end -}}{{- end -}}
 
 terraform {