diff --git a/kubernetes/workloads/cilium/manifests/overlays/fh/ciliumgatewayclassconfig.yaml b/kubernetes/workloads/cilium/manifests/overlays/fh/ciliumgatewayclassconfig.yaml
new file mode 100644
index 0000000..7bd2efd
--- /dev/null
+++ b/kubernetes/workloads/cilium/manifests/overlays/fh/ciliumgatewayclassconfig.yaml
@@ -0,0 +1,14 @@
+apiVersion: cilium.io/v2alpha1
+kind: CiliumGatewayClassConfig
+metadata:
+  name: default
+spec:
+  service:
+    type: LoadBalancer
+    loadBalancerClass: "kube-vip.io/kube-vip-class"
+    allocateLoadBalancerNodePorts: false
+    internalTrafficPolicy: Cluster
+    externalTrafficPolicy: Cluster
+    ipFamilies:
+      - IPv4
+    ipFamilyPolicy: SingleStack
diff --git a/kubernetes/workloads/cilium/manifests/overlays/fh/kustomization.yaml b/kubernetes/workloads/cilium/manifests/overlays/fh/kustomization.yaml
index 60216cc..4bc9667 100644
--- a/kubernetes/workloads/cilium/manifests/overlays/fh/kustomization.yaml
+++ b/kubernetes/workloads/cilium/manifests/overlays/fh/kustomization.yaml
@@ -1,10 +1,12 @@
 ---
 kind: Kustomization
 apiVersion: kustomize.config.k8s.io/v1beta1
+sortOptions:
+  order: fifo
 resources:
   - ../../base
+  - ./ciliumgatewayclassconfig.yaml
   - ./gateway.yaml
-  - ./service.yaml
   - ./ingress.yaml
   # - ./certificate.yaml
 patches:
diff --git a/kubernetes/workloads/cilium/manifests/overlays/fh/service.yaml b/kubernetes/workloads/cilium/manifests/overlays/fh/service.yaml
deleted file mode 100644
index 90ea15f..0000000
--- a/kubernetes/workloads/cilium/manifests/overlays/fh/service.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    implementation: kube-vip
-    io.cilium.gateway/owning-gateway: cilium-https-gateway
-  name: cilium-gateway-cilium-https-gateway
-  namespace: cilium
-spec:
-  allocateLoadBalancerNodePorts: true
-  internalTrafficPolicy: Cluster
-  ipFamilies:
-    - IPv4
-  ipFamilyPolicy: SingleStack
-  loadBalancerClass: kube-vip.io/kube-vip-class
-  externalTrafficPolicy: Cluster
-  ports:
-    - name: port-80
-      port: 80
-      protocol: TCP
-      targetPort: 80
-    - name: port-443
-      port: 443
-      protocol: TCP
-      targetPort: 443
-  type: LoadBalancer