diff --git a/Makefile b/Makefile
index 5141ec99..37951bf4 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ TAG?=latest
 IMG?=quay.io/samba.org/samba-operator:$(TAG)
 
 # Produce CRDs that work on Kubernetes 1.16 or later
-CRD_OPTIONS?="crd:trivialVersions=true,crdVersions=v1"
+CRD_OPTIONS?="crd:crdVersions=v1"
 
 CHECK_GOFMT_FLAGS?=-e -s -l
 
diff --git a/hack/install-tools.sh b/hack/install-tools.sh
index 8db332b7..a720f490 100755
--- a/hack/install-tools.sh
+++ b/hack/install-tools.sh
@@ -36,7 +36,7 @@ _install_kustomize() {
 }
 
 _install_controller_gen() {
-	_install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2
+	_install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
 }
 
 _install_revive() {