diff --git a/playbooks/cluster.yml b/playbooks/cluster.yml
index ea836b133..b3de2b736 100644
--- a/playbooks/cluster.yml
+++ b/playbooks/cluster.yml
@@ -52,6 +52,11 @@
     - { role: kubernetes/kubeadm, tags: kubeadm}
     - { role: kubernetes/node-label, tags: node-label }
     - { role: kubernetes/node-taint, tags: node-taint }
+    - role: kubernetes-apps/gateway_api
+      when: gateway_api_enabled
+      tags: gateway_api
+      delegate_to: "{{ groups['kube_control_plane'][0] }}"
+      run_once: true
     - { role: network_plugin, tags: network }
 
 - name: Install Calico Route Reflector
diff --git a/roles/kubernetes-apps/meta/main.yml b/roles/kubernetes-apps/meta/main.yml
index dedbacda6..aefc8d2a4 100644
--- a/roles/kubernetes-apps/meta/main.yml
+++ b/roles/kubernetes-apps/meta/main.yml
@@ -97,13 +97,6 @@ dependencies:
     tags:
       - container_engine_accelerator
 
-  - role: kubernetes-apps/gateway_api
-    when:
-      - gateway_api_enabled
-      - inventory_hostname == groups['kube_control_plane'][0]
-    tags:
-      - gateway_api
-
   - role: kubernetes-apps/kubelet-csr-approver
     when:
       - kubelet_csr_approver_enabled