diff --git a/config/crd/bases/.gitignore b/config/crd/bases/.gitignore
new file mode 100644
index 00000000000..848b22ab38f
--- /dev/null
+++ b/config/crd/bases/.gitignore
@@ -0,0 +1,10 @@
+# Workaround for change in behaviour introduced by https://github.com/kubernetes-sigs/controller-tools/pull/663
+
+_.yaml
+cli.*.yaml
+cni.*.yaml
+config.*.yaml
+cpi.*.yaml
+csi.*.yaml
+run.*.yaml
+core.*.yaml