diff --git a/deploy/manifests/00-crds.yaml b/deploy/manifests/00-crds.yaml
index 199130193..d128d0ae4 100644
--- a/deploy/manifests/00-crds.yaml
+++ b/deploy/manifests/00-crds.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -1376,8 +1375,6 @@ status:
   conditions: []
   storedVersions: []
 ---
-
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -1586,8 +1583,6 @@ status:
   conditions: []
   storedVersions: []
 ---
-
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -1777,8 +1772,6 @@ status:
   conditions: []
   storedVersions: []
 ---
-
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -2022,8 +2015,6 @@ status:
   conditions: []
   storedVersions: []
 ---
-
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -3687,8 +3678,6 @@ status:
   conditions: []
   storedVersions: []
 ---
-
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -5351,4 +5340,3 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
----
diff --git a/deploy/manifests/01-namespace.yaml b/deploy/manifests/01-namespace.yaml
index 7caa1f30b..6bc19f4cc 100644
--- a/deploy/manifests/01-namespace.yaml
+++ b/deploy/manifests/01-namespace.yaml
@@ -1,6 +1,5 @@
+---
 apiVersion: v1
 kind: Namespace
 metadata:
   name: cert-manager
-
----
diff --git a/hack/build/crds.bzl b/hack/build/crds.bzl
index def0ba118..df0adf126 100644
--- a/hack/build/crds.bzl
+++ b/hack/build/crds.bzl
@@ -43,8 +43,8 @@ def generated_crds(name, go_prefix, paths, out, visibility = [], deps = []):
             "output:crd:dir=$${output_dir};",
             "touch $$out;",
             "for file in $$(find \"$${output_dir}\" -type f | sort -V); do",
-            "  cat \"$$file\" >> \"$$out\";",
-            "  echo \"---\" >> \"$$out\";",
+            # concatenate all files while removing blank (^$) lines
+            "  cat \"$$file\" | sed '/^$$/d' >> \"$$out\";",
             "done;",
         ]),
         outs = [out],