diff --git a/Makefile b/Makefile
index 74f510454..6207c9a75 100644
--- a/Makefile
+++ b/Makefile
@@ -75,12 +75,11 @@ manifests: controller-gen kustomize
 crds: manifests
 	$(MOVE_GATEWAY_CRDS)
 	$(MOVE_AGA_CRDS)
-	$(KUSTOMIZE) build config/crd > helm/aws-load-balancer-controller/crds/crds.yaml
-	$(KUSTOMIZE) build config/crd/gateway > config/crd/gateway/gateway-crds.yaml
+	echo '---' > helm/aws-load-balancer-controller/crds/crds.yaml
+	$(KUSTOMIZE) build config/crd >> helm/aws-load-balancer-controller/crds/crds.yaml
 	echo '---' > config/crd/gateway/gateway-crds.yaml
 	$(KUSTOMIZE) build config/crd/gateway >> config/crd/gateway/gateway-crds.yaml
 	$(COPY_GATEWAY_CRDS_TO_HELM)
-	$(KUSTOMIZE) build config/crd/aga > config/crd/aga/aga-crds.yaml
 	echo '---' > config/crd/aga/aga-crds.yaml
 	$(KUSTOMIZE) build config/crd/aga >> config/crd/aga/aga-crds.yaml
 	$(COPY_AGA_CRDS_TO_HELM)