diff --git a/stable/ambassador/CHANGELOG.md b/stable/ambassador/CHANGELOG.md
index 06571d0903..765d618578 100644
--- a/stable/ambassador/CHANGELOG.md
+++ b/stable/ambassador/CHANGELOG.md
@@ -3,6 +3,14 @@
 This file documents all notable changes to Ambassador Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
+## v5.0.0
+
+### Breaking changes
+
+**Note** If upgrading an existing helm 2 installation no action is needed, previously installed CRDs will not be modified.
+
+- Helm 3 support for CRDs was added. Specifically, the CRD templates were moved to non-templated files in the `/crds` directory, and to keep Helm 2 support they are globbed from there by `/templates/crds.yaml`. However, because Helm 3 CRDs are not templated, the labels for new installations have necessarily changed
+
 ## v4.0.0
 
 ### Breaking Changes
diff --git a/stable/ambassador/Chart.yaml b/stable/ambassador/Chart.yaml
index 6561a06d18..5d9ac52265 100644
--- a/stable/ambassador/Chart.yaml
+++ b/stable/ambassador/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.85.0
 description: A Helm chart for Datawire Ambassador
 name: ambassador
-version: 4.4.9
+version: 5.0.0
 icon: https://www.getambassador.io/images/logo.png
 home: https://www.getambassador.io/
 sources:
diff --git a/stable/ambassador/README.md b/stable/ambassador/README.md
index fe6b97b0f2..35ae48c50f 100755
--- a/stable/ambassador/README.md
+++ b/stable/ambassador/README.md
@@ -196,6 +196,14 @@ $ helm upgrade --install --wait my-release -f values.yaml stable/ambassador
 
 # Upgrading
 
+## To 5.0.0
+
+### Breaking changes
+
+**Note** If upgrading an existing helm 2 installation no action is needed, previously installed CRDs will not be modified.
+
+- Helm 3 support for CRDs was added. Specifically, the CRD templates were moved to non-templated files in the `/crds` directory, and to keep Helm 2 support they are globbed from there by `/templates/crds.yaml`. However, because Helm 3 CRDs are not templated, the labels for new installations have necessarily changed
+
 ## To 4.0.0
 
 The 4.0.0 chart contains a number of changes to the way Ambassador Pro is installed.
diff --git a/stable/ambassador/templates/crd/authservice.yaml b/stable/ambassador/crds/authservice.yaml
similarity index 54%
rename from stable/ambassador/templates/crd/authservice.yaml
rename to stable/ambassador/crds/authservice.yaml
index d380a5c16e..08dc01f52c 100644
--- a/stable/ambassador/templates/crd/authservice.yaml
+++ b/stable/ambassador/crds/authservice.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.crds.create }}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: authservices.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -24,4 +18,3 @@ spec:
     plural: authservices
     singular: authservice
     kind: AuthService
-{{- end }}
diff --git a/stable/ambassador/templates/crd/consulresolver.yaml b/stable/ambassador/crds/consulresolver.yaml
similarity index 55%
rename from stable/ambassador/templates/crd/consulresolver.yaml
rename to stable/ambassador/crds/consulresolver.yaml
index e3f8a0481f..6831cd0c87 100644
--- a/stable/ambassador/templates/crd/consulresolver.yaml
+++ b/stable/ambassador/crds/consulresolver.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.crds.create }}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: consulresolvers.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -24,4 +18,3 @@ spec:
     plural: consulresolvers
     singular: consulresolver
     kind: ConsulResolver
-{{- end }}
diff --git a/stable/ambassador/templates/crd/filter.yaml b/stable/ambassador/crds/filter.yaml
similarity index 55%
rename from stable/ambassador/templates/crd/filter.yaml
rename to stable/ambassador/crds/filter.yaml
index d19bc30487..fd6f3c6058 100644
--- a/stable/ambassador/templates/crd/filter.yaml
+++ b/stable/ambassador/crds/filter.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.pro.enabled -}}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: filters.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -26,4 +20,3 @@ spec:
     kind: Filter
     shortNames:
     - fil
-{{- end -}}
diff --git a/stable/ambassador/templates/crd/filterpolicy.yaml b/stable/ambassador/crds/filterpolicy.yaml
similarity index 56%
rename from stable/ambassador/templates/crd/filterpolicy.yaml
rename to stable/ambassador/crds/filterpolicy.yaml
index ceb95666b4..f5feff859c 100644
--- a/stable/ambassador/templates/crd/filterpolicy.yaml
+++ b/stable/ambassador/crds/filterpolicy.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.pro.enabled -}}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: filterpolicies.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -26,4 +20,3 @@ spec:
     kind: FilterPolicy
     shortNames:
     - fp
-{{- end -}}
diff --git a/stable/ambassador/templates/crd/kubernetesendpointresolver.yaml b/stable/ambassador/crds/kubernetesendpointresolver.yaml
similarity index 58%
rename from stable/ambassador/templates/crd/kubernetesendpointresolver.yaml
rename to stable/ambassador/crds/kubernetesendpointresolver.yaml
index 8526c6a466..a7e6b7a5bc 100644
--- a/stable/ambassador/templates/crd/kubernetesendpointresolver.yaml
+++ b/stable/ambassador/crds/kubernetesendpointresolver.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.crds.create }}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: kubernetesendpointresolvers.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -24,4 +18,3 @@ spec:
     plural: kubernetesendpointresolvers
     singular: kubernetesendpointresolver
     kind: KubernetesEndpointResolver
-{{- end }}
diff --git a/stable/ambassador/templates/crd/kubernetesserviceresolver.yaml b/stable/ambassador/crds/kubernetesserviceresolver.yaml
similarity index 57%
rename from stable/ambassador/templates/crd/kubernetesserviceresolver.yaml
rename to stable/ambassador/crds/kubernetesserviceresolver.yaml
index 17cd4aab96..56652ce896 100644
--- a/stable/ambassador/templates/crd/kubernetesserviceresolver.yaml
+++ b/stable/ambassador/crds/kubernetesserviceresolver.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.crds.create }}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: kubernetesserviceresolvers.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -24,4 +18,3 @@ spec:
     plural: kubernetesserviceresolvers
     singular: kubernetesserviceresolver
     kind: KubernetesServiceResolver
-{{- end }}
diff --git a/stable/ambassador/templates/crd/mapping.yaml b/stable/ambassador/crds/mapping.yaml
similarity index 53%
rename from stable/ambassador/templates/crd/mapping.yaml
rename to stable/ambassador/crds/mapping.yaml
index aab7f82b1c..7e57df771f 100644
--- a/stable/ambassador/templates/crd/mapping.yaml
+++ b/stable/ambassador/crds/mapping.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.crds.create }}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: mappings.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -24,4 +18,3 @@ spec:
     plural: mappings
     singular: mapping
     kind: Mapping
-{{- end }}
diff --git a/stable/ambassador/templates/crd/module.yaml b/stable/ambassador/crds/module.yaml
similarity index 53%
rename from stable/ambassador/templates/crd/module.yaml
rename to stable/ambassador/crds/module.yaml
index 339f4b343f..3bd68a1ce7 100644
--- a/stable/ambassador/templates/crd/module.yaml
+++ b/stable/ambassador/crds/module.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.crds.create }}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: modules.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -24,4 +18,3 @@ spec:
     plural: modules
     singular: module
     kind: Module
-{{- end }}
diff --git a/stable/ambassador/templates/crd/ratelimit.yaml b/stable/ambassador/crds/ratelimit.yaml
similarity index 56%
rename from stable/ambassador/templates/crd/ratelimit.yaml
rename to stable/ambassador/crds/ratelimit.yaml
index 8863b4a4c9..d7379eba51 100644
--- a/stable/ambassador/templates/crd/ratelimit.yaml
+++ b/stable/ambassador/crds/ratelimit.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.pro.enabled -}}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: ratelimits.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -26,4 +20,3 @@ spec:
     kind: RateLimit
     shortNames:
     - rl
-{{- end -}}
diff --git a/stable/ambassador/templates/crd/ratelimitservice.yaml b/stable/ambassador/crds/ratelimitservice.yaml
similarity index 55%
rename from stable/ambassador/templates/crd/ratelimitservice.yaml
rename to stable/ambassador/crds/ratelimitservice.yaml
index ed912d8ebc..0cbf41c65d 100644
--- a/stable/ambassador/templates/crd/ratelimitservice.yaml
+++ b/stable/ambassador/crds/ratelimitservice.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.crds.create }}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: ratelimitservices.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -24,4 +18,3 @@ spec:
     plural: ratelimitservices
     singular: ratelimitservice
     kind: RateLimitService
-{{- end }}
diff --git a/stable/ambassador/templates/crd/tcpmapping.yaml b/stable/ambassador/crds/tcpmapping.yaml
similarity index 54%
rename from stable/ambassador/templates/crd/tcpmapping.yaml
rename to stable/ambassador/crds/tcpmapping.yaml
index 03c0f86901..69c0460233 100644
--- a/stable/ambassador/templates/crd/tcpmapping.yaml
+++ b/stable/ambassador/crds/tcpmapping.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.crds.create }}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: tcpmappings.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -24,4 +18,3 @@ spec:
     plural: tcpmappings
     singular: tcpmapping
     kind: TCPMapping
-{{- end }}
diff --git a/stable/ambassador/templates/crd/tlscontext.yaml b/stable/ambassador/crds/tlscontext.yaml
similarity index 54%
rename from stable/ambassador/templates/crd/tlscontext.yaml
rename to stable/ambassador/crds/tlscontext.yaml
index ea3e1efaf4..64919947fe 100644
--- a/stable/ambassador/templates/crd/tlscontext.yaml
+++ b/stable/ambassador/crds/tlscontext.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.crds.create }}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: tlscontexts.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -24,4 +18,3 @@ spec:
     plural: tlscontexts
     singular: tlscontext
     kind: TLSContext
-{{- end }}
diff --git a/stable/ambassador/templates/crd/tracingservice.yaml b/stable/ambassador/crds/tracingservice.yaml
similarity index 55%
rename from stable/ambassador/templates/crd/tracingservice.yaml
rename to stable/ambassador/crds/tracingservice.yaml
index b454650d80..407b27ed4f 100644
--- a/stable/ambassador/templates/crd/tracingservice.yaml
+++ b/stable/ambassador/crds/tracingservice.yaml
@@ -1,15 +1,9 @@
-{{- if .Values.crds.create }}
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: tracingservices.getambassador.io
   labels:
-    app.kubernetes.io/name: {{ include "ambassador.name" . }}
-    app.kubernetes.io/part-of: {{ .Release.Name }}
-    helm.sh/chart: {{ include "ambassador.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: ambassador
   annotations:
     "helm.sh/hook": crd-install
 spec:
@@ -24,4 +18,3 @@ spec:
     plural: tracingservices
     singular: tracingservice
     kind: TracingService
-{{- end }}
diff --git a/stable/ambassador/templates/crd-delete.yaml b/stable/ambassador/templates/crd-delete.yaml
index ee4e1826db..c71ae64c40 100644
--- a/stable/ambassador/templates/crd-delete.yaml
+++ b/stable/ambassador/templates/crd-delete.yaml
@@ -35,6 +35,6 @@ spec:
           - /bin/sh
           - -c
           - >
-              kubectl delete crds -l app.kubernetes.io/part-of={{ .Release.Name }}
+              kubectl delete crds -l app.kubernetes.io/name=ambassador
       restartPolicy: OnFailure
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/ambassador/templates/crds.yaml b/stable/ambassador/templates/crds.yaml
new file mode 100644
index 0000000000..3b3bf16d54
--- /dev/null
+++ b/stable/ambassador/templates/crds.yaml
@@ -0,0 +1,6 @@
+{{- if .Values.crds.create }}
+{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
+{{ $.Files.Get $path }}
+---
+{{- end }}
+{{- end }}