diff --git a/modules/irsa/versions.tf b/modules/irsa/versions.tf
index 4e4af1239d..d2ddf87cc2 100644
--- a/modules/irsa/versions.tf
+++ b/modules/irsa/versions.tf
@@ -1,8 +1,6 @@
 terraform {
   required_version = ">= 1.0.0"
 
-  experiments = [module_variable_optional_attrs]
-
   required_providers {
     aws = {
       source  = "hashicorp/aws"
diff --git a/modules/kubernetes-addons/kyverno/README.md b/modules/kubernetes-addons/kyverno/README.md
index e8b884b6fd..f2779b639a 100644
--- a/modules/kubernetes-addons/kyverno/README.md
+++ b/modules/kubernetes-addons/kyverno/README.md
@@ -35,13 +35,12 @@ No resources.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_addon_context"></a> [addon\_context](#input\_addon\_context) | Input configuration for the addon | <pre>object({<br>    aws_caller_identity_account_id = string<br>    aws_caller_identity_arn        = string<br>    aws_eks_cluster_endpoint       = string<br>    aws_partition_id               = string<br>    aws_region_name                = string<br>    eks_cluster_id                 = string<br>    eks_oidc_issuer_url            = string<br>    eks_oidc_provider_arn          = string<br>    tags                           = map(string)<br>  })</pre> | n/a | yes |
-| <a name="input_enable_kyverno"></a> [enable\_kyverno](#input\_enable\_kyverno) | Enable Kyverno | `bool` | `false` | no |
-| <a name="input_enable_kyverno_policies"></a> [enable\_kyverno\_policies](#input\_enable\_kyverno\_policies) | Enable Kyverno policies. Requires `enable_kyverno` to be `true` | `bool` | `false` | no |
-| <a name="input_enable_kyverno_policy_reporter"></a> [enable\_kyverno\_policy\_reporter](#input\_enable\_kyverno\_policy\_reporter) | Enable Kyverno UI. Requires `enable_kyverno` to be `true` | `bool` | `false` | no |
+| <a name="input_enable_kyverno_policies"></a> [enable\_kyverno\_policies](#input\_enable\_kyverno\_policies) | Enable Kyverno policies | `bool` | `false` | no |
+| <a name="input_enable_kyverno_policy_reporter"></a> [enable\_kyverno\_policy\_reporter](#input\_enable\_kyverno\_policy\_reporter) | Enable Kyverno UI | `bool` | `false` | no |
 | <a name="input_kyverno_helm_config"></a> [kyverno\_helm\_config](#input\_kyverno\_helm\_config) | Helm provider config for the Kyverno | `any` | `{}` | no |
 | <a name="input_kyverno_policies_helm_config"></a> [kyverno\_policies\_helm\_config](#input\_kyverno\_policies\_helm\_config) | Helm provider config for the Kyverno baseline policies | `any` | `{}` | no |
 | <a name="input_kyverno_policy_reporter_helm_config"></a> [kyverno\_policy\_reporter\_helm\_config](#input\_kyverno\_policy\_reporter\_helm\_config) | Helm provider config for the Kyverno policy reporter UI | `any` | `{}` | no |
-| <a name="input_manage_via_gitops"></a> [manage\_via\_gitops](#input\_manage\_via\_gitops) | Determines if the add-on should be managed via GitOps. | `bool` | `false` | no |
+| <a name="input_manage_via_gitops"></a> [manage\_via\_gitops](#input\_manage\_via\_gitops) | Determines if the add-on should be managed via GitOps | `bool` | `false` | no |
 
 ## Outputs
 
diff --git a/modules/kubernetes-addons/kyverno/variables.tf b/modules/kubernetes-addons/kyverno/variables.tf
index 7109ecdfbc..84206667dd 100644
--- a/modules/kubernetes-addons/kyverno/variables.tf
+++ b/modules/kubernetes-addons/kyverno/variables.tf
@@ -16,26 +16,20 @@ variable "kyverno_policy_reporter_helm_config" {
   default     = {}
 }
 
-variable "enable_kyverno" {
-  description = "Enable Kyverno"
-  default     = false
-  type        = bool
-}
-
 variable "enable_kyverno_policies" {
-  description = "Enable Kyverno policies. Requires `enable_kyverno` to be `true`"
+  description = "Enable Kyverno policies"
   type        = bool
   default     = false
 }
 
 variable "enable_kyverno_policy_reporter" {
-  description = "Enable Kyverno UI. Requires `enable_kyverno` to be `true`"
+  description = "Enable Kyverno UI"
   type        = bool
   default     = false
 }
 
 variable "manage_via_gitops" {
-  description = "Determines if the add-on should be managed via GitOps."
+  description = "Determines if the add-on should be managed via GitOps"
   type        = bool
   default     = false
 }
diff --git a/modules/kubernetes-addons/main.tf b/modules/kubernetes-addons/main.tf
index 5b9ca257dd..bbfa0ed5f7 100644
--- a/modules/kubernetes-addons/main.tf
+++ b/modules/kubernetes-addons/main.tf
@@ -572,7 +572,6 @@ module "kyverno" {
   addon_context     = local.addon_context
   manage_via_gitops = var.argocd_manage_add_ons
 
-  enable_kyverno      = var.enable_kyverno
   kyverno_helm_config = var.kyverno_helm_config
 
   enable_kyverno_policies      = var.enable_kyverno_policies