diff --git a/forgejo/certificate.yaml b/forgejo/certificate.yaml
deleted file mode 100644
index 66c8e1f..0000000
--- a/forgejo/certificate.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: forgejo-cert
-  namespace: istio-system
-spec:
-  secretName: forgejo-cert
-  issuerRef:
-    name: letsencrypt-dns
-    kind: ClusterIssuer
-  dnsNames:
-    - git.local.gwg313.xyz
-    - git.gwg313.xyz
-    - git.zerotier.gwg313.xyz
diff --git a/forgejo/destinationrule.yaml b/forgejo/destinationrule.yaml
deleted file mode 100644
index 1ec42cc..0000000
--- a/forgejo/destinationrule.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: networking.istio.io/v1beta1
-kind: DestinationRule
-metadata:
-  name: forgejo
-  namespace: forgejo
-spec:
-  host: forgejo.forgejo.svc.cluster.local
-  trafficPolicy:
-    outlierDetection:
-      consecutive5xxErrors: 1
-      interval: 5s
-      baseEjectionTime: 30s
diff --git a/forgejo/gateway.yaml b/forgejo/gateway.yaml
deleted file mode 100644
index fe0f840..0000000
--- a/forgejo/gateway.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: networking.istio.io/v1beta1
-kind: Gateway
-metadata:
-  name: forgejo-gateway
-  namespace: forgejo
-spec:
-  selector:
-    app: istio-ingressgateway
-  servers:
-    - port:
-        number: 443
-        name: https
-        protocol: HTTPS
-      tls:
-        mode: SIMPLE
-        credentialName: forgejo-cert
-      hosts:
-        - git.local.gwg313.xyz
-        - git.gwg313.xyz
-        - git.zerotier.gwg313.xyz
diff --git a/forgejo/route.yaml b/forgejo/route.yaml
new file mode 100644
index 0000000..1ed4771
--- /dev/null
+++ b/forgejo/route.yaml
@@ -0,0 +1,36 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: forgejo
+  namespace: forgejo
+spec:
+  parentRefs:
+    - name: shared-edge-gateway
+      namespace: cilium-ingress
+  hostnames:
+    - git.local.gwg313.xyz
+    - git.gwg313.xyz
+    - git.zerotier.gwg313.xyz
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: forgejo
+          port: 80 # 👈 Flattened directly to an integer, matching the Gateway API spec
+---
+apiVersion: gateway.networking.k8s.io/v1beta1
+kind: ReferenceGrant
+metadata:
+  name: allow-gateway-to-forgejo
+  namespace: forgejo
+spec:
+  from:
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      namespace: cilium-ingress
+  to:
+    - group: ""
+      kind: Service
+      name: forgejo
diff --git a/forgejo/virtualservice.yaml b/forgejo/virtualservice.yaml
deleted file mode 100644
index a1adf6e..0000000
--- a/forgejo/virtualservice.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: networking.istio.io/v1beta1
-kind: VirtualService
-metadata:
-  name: forgejo
-  namespace: forgejo
-spec:
-  hosts:
-    - git.local.gwg313.xyz
-    - git.gwg313.xyz
-    - git.zerotier.gwg313.xyz
-  gateways:
-    - forgejo-gateway
-  http:
-    - match:
-        - uri:
-            prefix: /
-      route:
-        - destination:
-            host: forgejo.forgejo.svc.cluster.local
-            port:
-              number: 80