diff --git a/values/cert-manager/env-hel1.yaml.gotmpl b/values/cert-manager/env-hel1.yaml.gotmpl
new file mode 100644
index 00000000..8b57f848
--- /dev/null
+++ b/values/cert-manager/env-hel1.yaml.gotmpl
@@ -0,0 +1,5 @@
+cert_manager:
+ enabled: true
+ autosync: true
+ gatewayApi:
+  enabled: true
diff --git a/values/cert-manager/env.yaml.gotmpl b/values/cert-manager/env.yaml.gotmpl
index 0df31c10..6b72d42a 100644
--- a/values/cert-manager/env.yaml.gotmpl
+++ b/values/cert-manager/env.yaml.gotmpl
@@ -1,3 +1,5 @@
 cert_manager:
  enabled: true
  autosync: true
+ gatewayApi:
+  enabled: false
diff --git a/values/cert-manager/values/cert-manager.yaml.gotmpl b/values/cert-manager/values/cert-manager.yaml.gotmpl
index 21ed315e..8ad56314 100644
--- a/values/cert-manager/values/cert-manager.yaml.gotmpl
+++ b/values/cert-manager/values/cert-manager.yaml.gotmpl
@@ -3,3 +3,9 @@ enableCertificateOwnerRef: true
 startupapicheck:
   podAnnotations:
     linkerd.io/inject: disabled
+{{- if .Values.cert_manager.gatewayApi.enabled }}
+config:
+  apiVersion: controller.config.cert-manager.io/v1alpha1
+  enableGatewayAPI: true
+  kind: ControllerConfiguration
+{{- end }}