diff --git a/CODEOWNERS b/CODEOWNERS
index 50d3195b..4e0014f8 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -7,7 +7,7 @@
 /charts/argo-events @jbehling
 
 # Argo Workflows
-/charts/argo @benjaminws
+/charts/argo @benjaminws @stefansedich
 
 # Argo Rollouts
 /charts/argo-rollouts @cabrinha
diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml
index 712e4fd5..305428de 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -49,3 +49,6 @@ data:
     {{- if .Values.controller.persistence }}
     persistence:
 {{ toYaml .Values.controller.persistence | indent 6 }}{{- end }}
+    {{- if .Values.controller.workflowDefaults }}
+    workflowDefaults:
+{{ toYaml .Values.controller.workflowDefaults | indent 6 }}{{- end }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 76ab6158..1ec6927f 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -47,6 +47,10 @@ controller:
     #    passwordSecret:
     #      name: argo-postgres-config
     #      key: password
+  workflowDefaults: {}  # Only valid for 2.7+
+  #  spec:
+  #    ttlStrategy:
+  #      secondsAfterCompletion: 84600
   telemetryConfig:
     enabled: false
     path: /telemetry