diff --git a/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl b/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl
index eebb58b2f..afdbf4cb5 100644
--- a/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl
+++ b/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl
@@ -1,4 +1,4 @@
-{{- if eq (include "understack.isEnabled" (list $.Values.site "envoy_configs")) "true" }}
+{{- if or (eq (include "understack.isEnabled" (list $.Values.global "envoy_configs")) "true") (eq (include "understack.isEnabled" (list $.Values.site "envoy_configs")) "true") }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
diff --git a/charts/argocd-understack/values.yaml b/charts/argocd-understack/values.yaml
index 4ee5cddfa..0ce584b44 100644
--- a/charts/argocd-understack/values.yaml
+++ b/charts/argocd-understack/values.yaml
@@ -57,6 +57,12 @@ global:
     # @default -- true
     enabled: true
 
+  # -- Envoy configs for Envoy Gateway API
+  envoy_configs:
+    # -- Enable/disable deploy Envoy Configs
+    # @default -- true
+    enabled: true
+
   # -- Envoy Gateway API gateway
   envoy_gateway:
     # -- Enable/disable deploying Envoy Gateway
@@ -111,6 +117,13 @@ global:
     # @default -- true
     enabled: true
 
+  # -- OpenEBS
+  openebs:
+    # -- Enable/disable deploying OpenEBS
+    # @default -- true
+    enabled: true
+
+
   # -- OpenStack Resource Controller operator
   openstack_resource_controller:
     # -- Enable/disable deploying OpenStack Resource Controller
@@ -141,12 +154,6 @@ global:
     # @default -- true
     enabled: true
 
-  # -- OpenEBS
-  openebs:
-    # -- Enable/disable deploying OpenEBS
-    # @default -- true
-    enabled: true
-
   # Sealed Secrets operator
   sealed_secrets:
     # -- Enable/disable deploying sealed secrets