diff --git a/charts/argocd-understack/templates/application-argo-events.yaml.tpl b/charts/argocd-understack/templates/application-argo-events.yaml.tpl
index 88e453cdb..6b3dc13d3 100644
--- a/charts/argocd-understack/templates/application-argo-events.yaml.tpl
+++ b/charts/argocd-understack/templates/application-argo-events.yaml.tpl
@@ -1,4 +1,4 @@
-{{- if eq (include "understack.isEnabled" (list $.Values.site "argo_events")) "true" }}
+{{- if or (eq (include "understack.isEnabled" (list $.Values.global "argo_events")) "true") (eq (include "understack.isEnabled" (list $.Values.site "argo_events")) "true") }}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
diff --git a/charts/argocd-understack/templates/application-argo-workflows.yaml.tpl b/charts/argocd-understack/templates/application-argo-workflows.yaml.tpl
index 1165acd5a..eb776dba2 100644
--- a/charts/argocd-understack/templates/application-argo-workflows.yaml.tpl
+++ b/charts/argocd-understack/templates/application-argo-workflows.yaml.tpl
@@ -1,4 +1,4 @@
-{{- if eq (include "understack.isEnabled" (list $.Values.site "argo_workflows")) "true" }}
+{{- if or (eq (include "understack.isEnabled" (list $.Values.global "argo_workflows")) "true") (eq (include "understack.isEnabled" (list $.Values.site "argo_workflows")) "true") }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
diff --git a/charts/argocd-understack/values.yaml b/charts/argocd-understack/values.yaml
index f08954d5b..4db99fd19 100644
--- a/charts/argocd-understack/values.yaml
+++ b/charts/argocd-understack/values.yaml
@@ -33,6 +33,18 @@ global:
   # @default -- true
   enabled: true
 
+  # -- Argo Events configuration for event-driven workflows
+  argo_events:
+    # -- Enable/disable deploying Argo Events
+    # @default -- true
+    enabled: true
+
+  # -- Argo Workflows configuration
+  argo_workflows:
+    # -- Enable/disable deploying Argo Workflows
+    # @default -- true
+    enabled: true
+
   # -- Cert-Manager
   cert_manager:
     # -- Enable/disable deploying Cert-Manager
@@ -123,7 +135,6 @@ global:
     # @default -- true
     enabled: true
 
-
   # -- OpenStack Resource Controller operator
   openstack_resource_controller:
     # -- Enable/disable deploying OpenStack Resource Controller
@@ -172,6 +183,18 @@ site:
   # @default -- true
   enabled: true
 
+  # -- Argo Events configuration for event-driven workflows
+  argo_events:
+    # -- Enable/disable deploying Argo Events
+    # @default -- true
+    enabled: true
+
+  # -- Argo Workflows configuration
+  argo_workflows:
+    # -- Enable/disable deploying Argo Workflows
+    # @default -- true
+    enabled: true
+
   # Cilium configurations
   cilium:
     # -- Enable/disable deploying Cilium configurations
@@ -372,18 +395,6 @@ site:
     # renovate: datasource=helm depName=ovn registryUrl=https://tarballs.opendev.org/openstack/openstack-helm-infra
     chartVersion: "2024.2.0"
 
-  # -- Argo Events configuration for event-driven workflows
-  argo_events:
-    # -- Enable/disable deploying Argo Events
-    # @default -- true
-    enabled: true
-
-  # -- Argo Workflows configuration
-  argo_workflows:
-    # -- Enable/disable deploying Argo Workflows
-    # @default -- true
-    enabled: true
-
   # -- Cert-Manager
   cert_manager:
     # -- Enable/disable deploying Cert-Manager