diff --git a/pve01.wheatley.in/k8s-wheatley/main.tf b/pve01.wheatley.in/k8s-wheatley/main.tf
index e97ae2e..a4bb367 100644
--- a/pve01.wheatley.in/k8s-wheatley/main.tf
+++ b/pve01.wheatley.in/k8s-wheatley/main.tf
@@ -8,6 +8,7 @@ locals {
   cluster_name        = "k8s-wheatley"
   kubernetes_version  = "1.34.1"
   talos_version       = "1.11.3"
+  gateway_api_version = "1.4.0"
   cilium_version      = "1.14.1"
   ipv4_gateway        = "10.13.38.1"
   cluster_endpoint_ip = "10.13.38.10"
@@ -152,6 +153,7 @@ module "talos-bootstrap" {
   node_config = {
     ipv4_gateway           = local.ipv4_gateway
     talos_version          = local.talos_version
+    gateway_api_version    = local.gateway_api_version
     cilium_version         = local.cilium_version
     cluster_name           = local.cluster_name
     kubernetes_version     = local.kubernetes_version
diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/main.tf b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/main.tf
index 2097b86..abc314d 100644
--- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/main.tf
+++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/main.tf
@@ -55,6 +55,7 @@ resource "talos_machine_configuration_apply" "config_apply_cp" {
       node_name           = format("%s.wheatley.in", var.node_config.proxmox_node)
       machine_type        = each.value.type
       talos_version       = var.node_config.talos_version
+      gateway-api_version = var.node_config.gateway_api_version
       cilium_version      = var.node_config.cilium_version
       cilium_install_file = file("${path.module}/templates/cilium-install.yaml.tmpl")
     })
@@ -79,6 +80,7 @@ resource "talos_machine_configuration_apply" "config_apply_worker" {
       node_name           = format("%s.wheatley.in", var.node_config.proxmox_node)
       machine_type        = each.value.type
       talos_version       = var.node_config.talos_version
+      gateway-api_version = var.node_config.gateway_api_version
       cilium_version      = var.node_config.cilium_version
       cilium_install_file = file("${path.module}/templates/cilium-install.yaml.tmpl")
     })
diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl
index 3db0a24..183dc29 100644
--- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl
+++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl
@@ -94,3 +94,7 @@ spec:
           - gatewayAPI.enableAlpn=true 
           - --set
           - gatewayAPI.enableAppProtocol=true
+          - --set
+          - hubble.relay.enabled=true
+          - --set 
+          - hubble.ui.enabled=true
diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl
index c177e20..bb1477e 100644
--- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl
+++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl
@@ -8,13 +8,11 @@ machine:
     hostname: ${hostname}
     nameservers:
       - 10.13.37.2
-    %{ if machine_type == "controlplane" }
     interfaces:
       - interface: eth0
         dhcp: false
         vip:
           ip: ${vip_address}
-    %{ endif }
   kubelet:
     extraArgs:
       pod-max-pids: 1000
@@ -37,6 +35,8 @@ cluster:
       name: none
   proxy:
     disabled: true
+  extraManifests:
+  - https://github.com/kubernetes-sigs/gateway-api/releases/download/v${gateway-api_version}/standard-install.yaml
   inlineManifests:
   - name: cilium-bootstrap
     contents: |
diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl
index 4227892..01a5391 100644
--- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl
+++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl
@@ -30,6 +30,8 @@ cluster:
       name: none
   proxy:
     disabled: true
+  extraManifests:
+  - https://github.com/kubernetes-sigs/gateway-api/releases/download/v${gateway-api_version}/standard-install.yaml
   inlineManifests:
   - name: cilium-bootstrap
     contents: |
diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/variables.tf b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/variables.tf
index 525a53a..34fb8e1 100644
--- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/variables.tf
+++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/variables.tf
@@ -3,6 +3,7 @@ variable "node_config" {
   type = object({
     ipv4_gateway           = string
     talos_version          = string
+    gateway_api_version    = string
     cilium_version         = string
     cluster_name           = string
     kubernetes_version     = string