diff --git a/Makefile b/Makefile
index 2d0fdf6..d886afa 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,9 @@ vet: ## Run go vet against code
 
 .PHONY: lint
 lint: fmt vet generate manifests ## All-in-one linting
+	@echo 'Checking kustomize build ...'
+	$(KUSTOMIZE) build config/crd -o /dev/null
+	$(KUSTOMIZE) build config/default -o /dev/null
 	@echo 'Check for uncommitted changes ...'
 	git diff --exit-code
 
diff --git a/Makefile.vars.mk b/Makefile.vars.mk
index 3e959c7..9e9ac3f 100644
--- a/Makefile.vars.mk
+++ b/Makefile.vars.mk
@@ -3,7 +3,7 @@ IMG_TAG ?= latest
 CURDIR ?= $(shell pwd)
 BIN_FILENAME ?= $(CURDIR)/$(PROJECT_ROOT_DIR)/openshift-upgrade-controller
 
-KUSTOMIZE ?= go run sigs.k8s.io/kustomize/kustomize/v4
+KUSTOMIZE ?= go run sigs.k8s.io/kustomize/kustomize/v5
 
 # Image URL to use all building/pushing image targets
 GHCR_IMG ?= ghcr.io/appuio/openshift-upgrade-controller:$(IMG_TAG)
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index a68a2f6..886e39c 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -6,7 +6,7 @@ resources:
 - bases/managedupgrade.appuio.io_upgradejobs.yaml
 - bases/managedupgrade.appuio.io_upgradeconfigs.yaml
 - bases/managedupgrade.appuio.io_upgradejobhooks.yaml
-- bases/managedupgrade.appuio.io_upgradesuspensionwindow.yaml
+- bases/managedupgrade.appuio.io_upgradesuspensionwindows.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge: