diff --git a/Makefile b/Makefile
index 850bd0283..32b2ab5f0 100644
--- a/Makefile
+++ b/Makefile
@@ -368,6 +368,13 @@ deploy-dependencies: kustomize dependencies-manifests ## Deploy dependencies to
 	$(KUSTOMIZE) build config/dependencies | kubectl apply -f -
 	kubectl -n "$(KUADRANT_NAMESPACE)" wait --timeout=300s --for=condition=Available deployments --all
 
+deploy-policy-controller: kustomize ## Deploy policy-controller to the K8s cluster specified in ~/.kube/config.
+	$(KUSTOMIZE) build config/policy-controller | kubectl apply -f -
+	kubectl -n "$(KUADRANT_NAMESPACE)" wait --timeout=300s --for=condition=Available deployments policy-controller
+
+undeploy-policy-controller: ## Undeploy policy-controller from the K8s cluster specified in ~/.kube/config.
+	$(KUSTOMIZE) build config/policy-controller | kubectl delete -f -
+
 .PHONY: install-metallb
 install-metallb: $(KUSTOMIZE) ## Installs the metallb load balancer allowing use of an LoadBalancer type with a gateway
 	$(KUSTOMIZE) build config/metallb | kubectl apply -f -
diff --git a/doc/user-guides/gateway-dns.md b/doc/user-guides/gateway-dns.md
index 18aba46df..8748aec98 100644
--- a/doc/user-guides/gateway-dns.md
+++ b/doc/user-guides/gateway-dns.md
@@ -26,6 +26,11 @@ Setup the environment:
 make local-setup
 ```
 
+Deploy policy controller and install DNSPolicy CRD:
+```shell
+make deploy-policy-controller
+```
+
 Install metallb:
 ```shell
 make install-metallb
diff --git a/doc/user-guides/gateway-tls.md b/doc/user-guides/gateway-tls.md
index 0a186f55e..aa577b671 100644
--- a/doc/user-guides/gateway-tls.md
+++ b/doc/user-guides/gateway-tls.md
@@ -25,6 +25,11 @@ Setup the environment:
 make local-setup
 ```
 
+Deploy policy controller and install TLSPolicy CRD:
+```shell
+make deploy-policy-controller
+```
+
 Install metallb:
 ```shell
 make install-metallb
@@ -64,7 +69,7 @@ kubectl create namespace my-gateways
 
 ### Create an ingress gateway
 
-Create a gateway using your ROOT_DOMAIN as part of a listener hostname:
+Create a gateway:
 ```sh
 kubectl -n my-gateways apply -f - <<EOF
 apiVersion: gateway.networking.k8s.io/v1