diff --git a/modules/kubernetes-addons/agones/main.tf b/modules/kubernetes-addons/agones/main.tf
index c38340fdd5..43db28f9be 100644
--- a/modules/kubernetes-addons/agones/main.tf
+++ b/modules/kubernetes-addons/agones/main.tf
@@ -1,8 +1,8 @@
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.this]
diff --git a/modules/kubernetes-addons/airflow/main.tf b/modules/kubernetes-addons/airflow/main.tf
index 83e8241e33..ab74c4a6f7 100644
--- a/modules/kubernetes-addons/airflow/main.tf
+++ b/modules/kubernetes-addons/airflow/main.tf
@@ -19,8 +19,8 @@ locals {
 # Apache Airflow Helm Add-on
 #-------------------------------------------------
 module "helm_addon" {
-  source        = "../helm-addon"
+  source = "../helm-addon"
+
   helm_config   = local.helm_config
-  irsa_config   = null
   addon_context = var.addon_context
 }
diff --git a/modules/kubernetes-addons/argo-rollouts/main.tf b/modules/kubernetes-addons/argo-rollouts/main.tf
index 1ad1291c3d..dc13a29d51 100644
--- a/modules/kubernetes-addons/argo-rollouts/main.tf
+++ b/modules/kubernetes-addons/argo-rollouts/main.tf
@@ -1,8 +1,8 @@
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.this]
diff --git a/modules/kubernetes-addons/argocd/main.tf b/modules/kubernetes-addons/argocd/main.tf
index 96f78947b3..05a795c86d 100644
--- a/modules/kubernetes-addons/argocd/main.tf
+++ b/modules/kubernetes-addons/argocd/main.tf
@@ -1,7 +1,7 @@
 module "helm_addon" {
-  source        = "../helm-addon"
+  source = "../helm-addon"
+
   helm_config   = local.helm_config
-  irsa_config   = null
   addon_context = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.this]
diff --git a/modules/kubernetes-addons/cert-manager-csi-driver/main.tf b/modules/kubernetes-addons/cert-manager-csi-driver/main.tf
index 72a9047c55..b846ae9538 100644
--- a/modules/kubernetes-addons/cert-manager-csi-driver/main.tf
+++ b/modules/kubernetes-addons/cert-manager-csi-driver/main.tf
@@ -1,7 +1,7 @@
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 }
diff --git a/modules/kubernetes-addons/cluster-proportional-autoscaler/main.tf b/modules/kubernetes-addons/cluster-proportional-autoscaler/main.tf
index 5f1f00a16a..13cbb4217b 100644
--- a/modules/kubernetes-addons/cluster-proportional-autoscaler/main.tf
+++ b/modules/kubernetes-addons/cluster-proportional-autoscaler/main.tf
@@ -2,10 +2,10 @@
 # Cluster Proportional Autoscaler Helm Add-on
 #-------------------------------------------------
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
   set_values        = local.set_values
-  irsa_config       = null
   addon_context     = var.addon_context
 }
diff --git a/modules/kubernetes-addons/crossplane/main.tf b/modules/kubernetes-addons/crossplane/main.tf
index e9e748ba92..e9318f115e 100644
--- a/modules/kubernetes-addons/crossplane/main.tf
+++ b/modules/kubernetes-addons/crossplane/main.tf
@@ -6,9 +6,9 @@ resource "kubernetes_namespace_v1" "crossplane" {
 }
 
 module "helm_addon" {
-  source        = "../helm-addon"
+  source = "../helm-addon"
+
   helm_config   = local.helm_config
-  irsa_config   = null
   addon_context = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.crossplane]
diff --git a/modules/kubernetes-addons/ingress-nginx/main.tf b/modules/kubernetes-addons/ingress-nginx/main.tf
index f2ab1060b5..09d42c4ab2 100644
--- a/modules/kubernetes-addons/ingress-nginx/main.tf
+++ b/modules/kubernetes-addons/ingress-nginx/main.tf
@@ -3,10 +3,10 @@
 #-------------------------------------
 
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.this]
diff --git a/modules/kubernetes-addons/kuberay-operator/main.tf b/modules/kubernetes-addons/kuberay-operator/main.tf
index 70c8cc4470..dfc8f90d20 100644
--- a/modules/kubernetes-addons/kuberay-operator/main.tf
+++ b/modules/kubernetes-addons/kuberay-operator/main.tf
@@ -23,6 +23,5 @@ module "helm_addon" {
     var.helm_config
   )
 
-  irsa_config   = null
   addon_context = var.addon_context
 }
diff --git a/modules/kubernetes-addons/kubernetes-dashboard/main.tf b/modules/kubernetes-addons/kubernetes-dashboard/main.tf
index 1e039842d2..c5efe40051 100644
--- a/modules/kubernetes-addons/kubernetes-dashboard/main.tf
+++ b/modules/kubernetes-addons/kubernetes-dashboard/main.tf
@@ -1,8 +1,8 @@
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.this]
diff --git a/modules/kubernetes-addons/metrics-server/main.tf b/modules/kubernetes-addons/metrics-server/main.tf
index cf8814fc12..eaf3a4aaff 100644
--- a/modules/kubernetes-addons/metrics-server/main.tf
+++ b/modules/kubernetes-addons/metrics-server/main.tf
@@ -1,8 +1,8 @@
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.this]
diff --git a/modules/kubernetes-addons/opentelemetry-operator/main.tf b/modules/kubernetes-addons/opentelemetry-operator/main.tf
index b4b39abaf6..b1e538e41c 100644
--- a/modules/kubernetes-addons/opentelemetry-operator/main.tf
+++ b/modules/kubernetes-addons/opentelemetry-operator/main.tf
@@ -292,7 +292,6 @@ module "helm_addon" {
   count  = var.enable_opentelemetry_operator ? 1 : 0
 
   helm_config   = local.helm_config
-  irsa_config   = null
   addon_context = var.addon_context
 
   depends_on = [module.cert_manager]
diff --git a/modules/kubernetes-addons/prometheus/main.tf b/modules/kubernetes-addons/prometheus/main.tf
index 0d3b8a3956..4edbe44b7a 100644
--- a/modules/kubernetes-addons/prometheus/main.tf
+++ b/modules/kubernetes-addons/prometheus/main.tf
@@ -61,7 +61,6 @@ module "helm_addon" {
     }
   ] : []
 
-  irsa_config   = null
   addon_context = var.addon_context
 }
 
diff --git a/modules/kubernetes-addons/reloader/main.tf b/modules/kubernetes-addons/reloader/main.tf
index 72a9047c55..b846ae9538 100644
--- a/modules/kubernetes-addons/reloader/main.tf
+++ b/modules/kubernetes-addons/reloader/main.tf
@@ -1,7 +1,7 @@
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 }
diff --git a/modules/kubernetes-addons/spark-k8s-operator/main.tf b/modules/kubernetes-addons/spark-k8s-operator/main.tf
index 1ad1291c3d..dc13a29d51 100644
--- a/modules/kubernetes-addons/spark-k8s-operator/main.tf
+++ b/modules/kubernetes-addons/spark-k8s-operator/main.tf
@@ -1,8 +1,8 @@
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.this]
diff --git a/modules/kubernetes-addons/traefik/main.tf b/modules/kubernetes-addons/traefik/main.tf
index 1ad1291c3d..dc13a29d51 100644
--- a/modules/kubernetes-addons/traefik/main.tf
+++ b/modules/kubernetes-addons/traefik/main.tf
@@ -1,8 +1,8 @@
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.this]
diff --git a/modules/kubernetes-addons/vpa/main.tf b/modules/kubernetes-addons/vpa/main.tf
index 828758a8df..813c8b094e 100644
--- a/modules/kubernetes-addons/vpa/main.tf
+++ b/modules/kubernetes-addons/vpa/main.tf
@@ -1,8 +1,8 @@
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.vpa]
diff --git a/modules/kubernetes-addons/yunikorn/main.tf b/modules/kubernetes-addons/yunikorn/main.tf
index 21e921b3de..1a27469b01 100644
--- a/modules/kubernetes-addons/yunikorn/main.tf
+++ b/modules/kubernetes-addons/yunikorn/main.tf
@@ -1,8 +1,8 @@
 module "helm_addon" {
-  source            = "../helm-addon"
+  source = "../helm-addon"
+
   manage_via_gitops = var.manage_via_gitops
   helm_config       = local.helm_config
-  irsa_config       = null
   addon_context     = var.addon_context
 
   depends_on = [kubernetes_namespace_v1.yunikorn]