diff --git a/helm/db-controller-crds/crd/persistance.atlas.infoblox.com_databaseclaims.yaml b/helm/db-controller-crds/crds/persistance.atlas.infoblox.com_databaseclaims.yaml
similarity index 100%
rename from helm/db-controller-crds/crd/persistance.atlas.infoblox.com_databaseclaims.yaml
rename to helm/db-controller-crds/crds/persistance.atlas.infoblox.com_databaseclaims.yaml
diff --git a/helm/db-controller-crds/crd/persistance.atlas.infoblox.com_dbroleclaims.yaml b/helm/db-controller-crds/crds/persistance.atlas.infoblox.com_dbroleclaims.yaml
similarity index 100%
rename from helm/db-controller-crds/crd/persistance.atlas.infoblox.com_dbroleclaims.yaml
rename to helm/db-controller-crds/crds/persistance.atlas.infoblox.com_dbroleclaims.yaml
diff --git a/helm/db-controller/templates/xrd.yaml b/helm/db-controller-crds/crds/xrd.yaml
similarity index 90%
rename from helm/db-controller/templates/xrd.yaml
rename to helm/db-controller-crds/crds/xrd.yaml
index d5bd4951..13ebc05b 100644
--- a/helm/db-controller/templates/xrd.yaml
+++ b/helm/db-controller-crds/crds/xrd.yaml
@@ -1,6 +1,3 @@
-{{- if .Values.xrd.create }}
-# TODO: should this move to a hook/crd install?
-{{- if not (lookup "apiextensions.crossplane.io/v1" "CompositeResourceDefinition" "" "xnetworkrecords.persistance.infoblox.com") }}
 apiVersion: apiextensions.crossplane.io/v1
 kind: CompositeResourceDefinition
 metadata:
@@ -62,6 +59,3 @@ spec:
                       description: 'Subnetwork is the subnet to provision IP addresses for PSC
                         ie. projects/gcp-eng-ddiaas-dev/regions/us-east1/subnetworks/private-service-connect'
                       type: string
-{{- end }}
----
-{{- end }}
diff --git a/helm/db-controller-crds/templates/crds.yaml b/helm/db-controller-crds/templates/crds.yaml
index 2cce02ba..34b96142 100644
--- a/helm/db-controller-crds/templates/crds.yaml
+++ b/helm/db-controller-crds/templates/crds.yaml
@@ -1,5 +1,5 @@
-{{- if .Values.crd.install }}
-{{- range $path, $bytes := .Files.Glob "crd/*.yaml" }}
+{{- if .Values.crds.install }}
+{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
 {{ $.Files.Get $path }}
 ---
 {{- end }}
diff --git a/helm/db-controller-crds/values.yaml b/helm/db-controller-crds/values.yaml
index 3e22a7f0..e6409950 100644
--- a/helm/db-controller-crds/values.yaml
+++ b/helm/db-controller-crds/values.yaml
@@ -1,2 +1,6 @@
-crd:
-  install: true
+crds:
+  # This is a hack to render CRDs even if they're installed
+  # Use this with caution as it will also uninstall CRDs
+  # We can now do this with CreateReplace in flux so
+  # this is being disabled.
+  install: false
diff --git a/helm/db-controller/values.yaml b/helm/db-controller/values.yaml
index 59fc07d5..216428d8 100644
--- a/helm/db-controller/values.yaml
+++ b/helm/db-controller/values.yaml
@@ -33,9 +33,6 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-xrd:
-  create: true
-
 xr:
   create: true