diff --git a/Makefile b/Makefile
index 3cf2e1eafe5..00f6d375a22 100644
--- a/Makefile
+++ b/Makefile
@@ -270,7 +270,7 @@ kind-load-images:
 
 GATEWAY_API_VERSION ?= v0.5.1
 GATEWAY_API_PACKAGE ?= sigs.k8s.io/gateway-api@$(GATEWAY_API_VERSION)
-GATEWAY_API_CRDS_GO_MOD_PATH = $(shell go env GOPATH)/pkg/mod/$(GATEWAY_API_PACKAGE)/config/crd
+GATEWAY_API_CRDS_GO_MOD_PATH = $(shell go env GOPATH)/pkg/mod/$(GATEWAY_API_PACKAGE)
 GATEWAY_API_CRDS_LOCAL_PATH = $(PWD)/samples/deploy/gateway-api/$(GATEWAY_API_VERSION)
 
 .PHONY: go-mod-download-gateway-api
@@ -280,14 +280,16 @@ go-mod-download-gateway-api:
 ### install:				Install Gateway API CRDs into the K8s cluster.
 .PHONY: install-gateway-api
 install-gateway-api: go-mod-download-gateway-api
-	kubectl apply -k $(GATEWAY_API_CRDS_GO_MOD_PATH)
-	kubectl apply -k $(GATEWAY_API_CRDS_GO_MOD_PATH)/experimental
+	kubectl apply -k $(GATEWAY_API_CRDS_GO_MOD_PATH)/config/crd
+	kubectl apply -k $(GATEWAY_API_CRDS_GO_MOD_PATH)/config/crd/experimental
+	kubectl apply -f $(GATEWAY_API_CRDS_GO_MOD_PATH)/config/webhook
 
 ### uninstall-gateway-api:	Uninstall Gateway API CRDs from the K8s cluster.
 .PHONY: uninstall-gateway-api
-uninstall-gateway-api:
-	kubectl delete -k $(GATEWAY_API_CRDS_GO_MOD_PATH)
-	kubectl delete -k $(GATEWAY_API_CRDS_GO_MOD_PATH)/experimental
+uninstall-gateway-api: go-mod-download-gateway-api
+	kubectl delete -k $(GATEWAY_API_CRDS_GO_MOD_PATH)/config/crd
+	kubectl delete -k $(GATEWAY_API_CRDS_GO_MOD_PATH)/config/crd/experimental
+	kubectl delete -f $(GATEWAY_API_CRDS_GO_MOD_PATH)/config/webhook
 
 ### install:				Use local yaml install Gateway API CRDs into the K8s cluster.
 .PHONY: install-gateway-api-local