diff --git a/argocd/namespaces/kube-system/cilium-l2-announcement-policy.yaml b/argocd/cluster-resources/cilium-l2-announcement-policy.yaml
similarity index 88%
rename from argocd/namespaces/kube-system/cilium-l2-announcement-policy.yaml
rename to argocd/cluster-resources/cilium-l2-announcement-policy.yaml
index 233c1ed..6606105 100644
--- a/argocd/namespaces/kube-system/cilium-l2-announcement-policy.yaml
+++ b/argocd/cluster-resources/cilium-l2-announcement-policy.yaml
@@ -2,7 +2,6 @@ apiVersion: cilium.io/v2alpha1
 kind: CiliumL2AnnouncementPolicy
 metadata:
   name: default
-  namespace: kube-system
   annotations:
     argocd.argoproj.io/sync-wave: "-1000"
 spec:
diff --git a/kubernetes/helm_releases.tf b/kubernetes/helm_releases.tf
index 3f9b8c7..bd9ad87 100644
--- a/kubernetes/helm_releases.tf
+++ b/kubernetes/helm_releases.tf
@@ -44,27 +44,4 @@ resource "helm_release" "argocd_app_of_apps" {
       value = var.argocd_app_of_apps_sync_policy
     },
   ]
-}
-
-# data "helm_template" "argocd_app_of_apps" {
-#
-#   depends_on = [helm_release.argocd]
-#   name       = "app-of-apps"
-#   chart      = "${path.module}/helm_charts/app-of-apps"
-#   namespace  = kubernetes_namespace_v1.argocd.id
-#   timeout    = 60
-#   set = [
-#     {
-#       name  = "source"
-#       value = var.argocd_app_of_apps_source
-#     },
-#     {
-#       name  = "syncPolicy"
-#       value = var.argocd_app_of_apps_sync_policy
-#     },
-#   ]
-# }
-#
-# output "argocd_app_of_apps_rendered_yaml" {
-#   value = data.helm_template.argocd_app_of_apps.manifest
-# }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/kubernetes/locals.tf b/kubernetes/locals.tf
index 1e6aff5..a1d6034 100644
--- a/kubernetes/locals.tf
+++ b/kubernetes/locals.tf
@@ -21,6 +21,7 @@ locals {
         name  = "server.ingress.ingressClassName"
         value = "cilium"
       },
-    ] : []
+    ] : [],
+    length(var.argocd_helm_values) > 0 ? var.argocd_helm_values : []
   )
 }
diff --git a/kubernetes/variables.tf b/kubernetes/variables.tf
index 5f153c5..accbd9f 100644
--- a/kubernetes/variables.tf
+++ b/kubernetes/variables.tf
@@ -44,6 +44,15 @@ variable "argocd_ingress_enabled" {
   default     = true
 }
 
+variable "argocd_helm_values" {
+  description = "Additional Helm values for installing the ArgoCD Helm chart"
+  type = list(object({
+    name  = string
+    value = string
+  }))
+  default = []
+}
+
 # See: https://argo-cd.readthedocs.io/en/latest/operator-manual/cluster-bootstrapping/#app-of-apps-pattern
 variable "install_argocd_app_of_apps" {
   description = "Flag for bootstrapping ArgoCD with an App of Apps"