diff --git a/stable/kong/Chart.yaml b/stable/kong/Chart.yaml
index 186aba8982..6e6762cae0 100644
--- a/stable/kong/Chart.yaml
+++ b/stable/kong/Chart.yaml
@@ -12,5 +12,5 @@ maintainers:
 name: kong
 sources:
 - https://github.com/Kong/kong
-version: 0.6.4
+version: 0.6.5
 appVersion: 0.14.1
diff --git a/stable/kong/templates/crd-kongconsumer.yaml b/stable/kong/templates/crd-kongconsumer.yaml
index a92ea9f981..a25eff50b0 100644
--- a/stable/kong/templates/crd-kongconsumer.yaml
+++ b/stable/kong/templates/crd-kongconsumer.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ingressController.enabled -}}
+{{- if and .Values.ingressController.enabled .Values.ingressController.installCRDs -}}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
diff --git a/stable/kong/templates/crd-kongcredential.yaml b/stable/kong/templates/crd-kongcredential.yaml
index dab969f39e..d442157877 100644
--- a/stable/kong/templates/crd-kongcredential.yaml
+++ b/stable/kong/templates/crd-kongcredential.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ingressController.enabled -}}
+{{- if and .Values.ingressController.enabled .Values.ingressController.installCRDs -}}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
diff --git a/stable/kong/templates/crd-kongingress.yaml b/stable/kong/templates/crd-kongingress.yaml
index 3e3f97dd7b..17d4ce73d8 100644
--- a/stable/kong/templates/crd-kongingress.yaml
+++ b/stable/kong/templates/crd-kongingress.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ingressController.enabled -}}
+{{- if and .Values.ingressController.enabled .Values.ingressController.installCRDs -}}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
diff --git a/stable/kong/templates/crd-kongplugins.yaml b/stable/kong/templates/crd-kongplugins.yaml
index 104512a713..bdd96048c3 100644
--- a/stable/kong/templates/crd-kongplugins.yaml
+++ b/stable/kong/templates/crd-kongplugins.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ingressController.enabled -}}
+{{- if and .Values.ingressController.enabled .Values.ingressController.installCRDs -}}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
diff --git a/stable/kong/values.yaml b/stable/kong/values.yaml
index c7203a09b9..49bffe66a5 100644
--- a/stable/kong/values.yaml
+++ b/stable/kong/values.yaml
@@ -183,6 +183,8 @@ ingressController:
     successThreshold: 1
     timeoutSeconds: 5
 
+  installCRDs: true
+
   rbac:
     # Specifies whether RBAC resources should be created
     create: true