diff --git a/apps/media/jellyfin/http-route.yaml b/apps/media/jellyfin/http-route.yaml
index 4d6da71..99e47cd 100644
--- a/apps/media/jellyfin/http-route.yaml
+++ b/apps/media/jellyfin/http-route.yaml
@@ -4,7 +4,7 @@ metadata:
   name: jellyfin
 spec:
   parentRefs:
-    - name: cilium-gateway
+    - name: stonegarden
       namespace: gateway
   hostnames:
     - "jellyfin.stonegarden.dev"
diff --git a/apps/media/plex/http-route.yaml b/apps/media/plex/http-route.yaml
index e5ac4db..b760020 100644
--- a/apps/media/plex/http-route.yaml
+++ b/apps/media/plex/http-route.yaml
@@ -4,7 +4,7 @@ metadata:
   name: plex-http-route
 spec:
   parentRefs:
-    - name: cilium-gateway
+    - name: stonegarden
       namespace: gateway
   hostnames:
     - "plex.stonegarden.dev"
diff --git a/apps/public/blog/http-route.yaml b/apps/public/blog/http-route.yaml
index 4bf2da0..125e03e 100644
--- a/apps/public/blog/http-route.yaml
+++ b/apps/public/blog/http-route.yaml
@@ -4,7 +4,7 @@ metadata:
   name: blog-http-route
 spec:
   parentRefs:
-    - name: cilium-gateway
+    - name: stonegarden
       namespace: gateway
   hostnames:
     - "blog.stonegarden.dev"
diff --git a/apps/public/blog/remark42/http-route.yaml b/apps/public/blog/remark42/http-route.yaml
index 77c8471..27d9c97 100644
--- a/apps/public/blog/remark42/http-route.yaml
+++ b/apps/public/blog/remark42/http-route.yaml
@@ -4,7 +4,7 @@ metadata:
   name: remark42-http-route
 spec:
   parentRefs:
-    - name: cilium-gateway
+    - name: stonegarden
       namespace: gateway
   hostnames:
     - "remark42.stonegarden.dev"
diff --git a/apps/public/stonegarden/deployment.yaml b/apps/public/stonegarden/deployment.yaml
index ee9e398..62bd603 100644
--- a/apps/public/stonegarden/deployment.yaml
+++ b/apps/public/stonegarden/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: stonegarden
+  namespace: stonegarden
 spec:
   replicas: 1
   selector:
diff --git a/apps/public/stonegarden/http-route.yaml b/apps/public/stonegarden/http-route.yaml
index 34a7e8d..e3b4295 100644
--- a/apps/public/stonegarden/http-route.yaml
+++ b/apps/public/stonegarden/http-route.yaml
@@ -1,10 +1,11 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: jellyfin-http-route
+  name: stonegarden
+  namespace: stonegarden
 spec:
   parentRefs:
-    - name: cilium-gateway
+    - name: stonegarden
       namespace: gateway
   hostnames:
     - "stonegarden.dev"
diff --git a/apps/public/stonegarden/kustomization.yaml b/apps/public/stonegarden/kustomization.yaml
index 6498143..6d9e15c 100644
--- a/apps/public/stonegarden/kustomization.yaml
+++ b/apps/public/stonegarden/kustomization.yaml
@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: stonegarden
+
 commonLabels:
   app: stonegarden
 
diff --git a/apps/public/stonegarden/service.yaml b/apps/public/stonegarden/service.yaml
index d556a1f..037aa84 100644
--- a/apps/public/stonegarden/service.yaml
+++ b/apps/public/stonegarden/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: stonegarden
+  namespace: stonegarden
 spec:
   type: ClusterIP
   ports:
diff --git a/apps/test/whoami/http-route.yaml b/apps/test/whoami/http-route.yaml
index acafc0a..c77279e 100644
--- a/apps/test/whoami/http-route.yaml
+++ b/apps/test/whoami/http-route.yaml
@@ -4,7 +4,7 @@ metadata:
   name: whoami-http-route
 spec:
   parentRefs:
-    - name: cilium-gateway
+    - name: stonegarden
       namespace: gateway
   hostnames:
     - "gateway.stonegarden.dev"
diff --git a/apps/utility/haos/http-route.yaml b/apps/utility/haos/http-route.yaml
index 0333dd7..632d894 100644
--- a/apps/utility/haos/http-route.yaml
+++ b/apps/utility/haos/http-route.yaml
@@ -5,10 +5,10 @@ metadata:
   namespace: haos
 spec:
   parentRefs:
-    - name: cilium-gateway
+    - name: stonegarden
       namespace: gateway
   hostnames:
-    - "haos.euclid.stonegarden.dev"
+    - "haos.stonegarden.dev"
   rules:
     - matches:
         - path:
diff --git a/apps/utility/proxmox/tls-route.yaml b/apps/utility/proxmox/tls-route.yaml
index 4411520..ea913f3 100644
--- a/apps/utility/proxmox/tls-route.yaml
+++ b/apps/utility/proxmox/tls-route.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: proxmox
 spec:
   parentRefs:
-    - name: cilium-gateway
+    - name: euclid
       namespace: gateway
   hostnames:
     - "proxmox.euclid.stonegarden.dev"
diff --git a/infra/database/http-route.yaml b/infra/database/http-route.yaml
index 0d316ff..159104d 100644
--- a/infra/database/http-route.yaml
+++ b/infra/database/http-route.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: postgres
 spec:
   parentRefs:
-    - name: cilium-gateway
+    - name: stonegarden
       namespace: gateway
   hostnames:
     - "postgres.stonegarden.dev"
diff --git a/infra/gateway/gw-euclid.yaml b/infra/gateway/gw-euclid.yaml
new file mode 100644
index 0000000..a405096
--- /dev/null
+++ b/infra/gateway/gw-euclid.yaml
@@ -0,0 +1,24 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: Gateway
+metadata:
+  name: euclid
+  namespace: gateway
+  annotations:
+    cert-manager.io/issuer: cloudflare-issuer
+spec:
+  gatewayClassName: cilium
+  infrastructure:
+    annotations:
+      io.cilium/lb-ipam-ips: 192.168.1.173
+  listeners:
+    - protocol: HTTPS
+      port: 443
+      name: https-euclid
+      hostname: "*.euclid.stonegarden.dev"
+      tls:
+        certificateRefs:
+          - kind: Secret
+            name: cf-euclid-cert
+      allowedRoutes:
+        namespaces:
+          from: All
\ No newline at end of file
diff --git a/infra/gateway/gateway.yaml b/infra/gateway/gw-stonegarden.yaml
similarity index 72%
rename from infra/gateway/gateway.yaml
rename to infra/gateway/gw-stonegarden.yaml
index 50eaa86..1c9c9ce 100644
--- a/infra/gateway/gateway.yaml
+++ b/infra/gateway/gw-stonegarden.yaml
@@ -1,7 +1,7 @@
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
-  name: cilium-gateway
+  name: stonegarden
   namespace: gateway
   annotations:
     cert-manager.io/issuer: cloudflare-issuer
@@ -22,17 +22,6 @@ spec:
       allowedRoutes:
         namespaces:
           from: All
-    - protocol: HTTPS
-      port: 443
-      name: https-gateway-euclid
-      hostname: "*.euclid.stonegarden.dev"
-      tls:
-        certificateRefs:
-          - kind: Secret
-            name: cloudflare-cert
-      allowedRoutes:
-        namespaces:
-          from: All
     - protocol: HTTPS
       port: 443
       name: https-domain-gateway
diff --git a/infra/gateway/kustomization.yaml b/infra/gateway/kustomization.yaml
index 1779f0c..58d9426 100644
--- a/infra/gateway/kustomization.yaml
+++ b/infra/gateway/kustomization.yaml
@@ -7,4 +7,5 @@ resources:
   - ns.yaml
   - cloudflare-api-token.yaml
   - cloudflare-issuer.yaml
-  - gateway.yaml
\ No newline at end of file
+  - gw-stonegarden.yaml
+  - gw-euclid.yaml
\ No newline at end of file
diff --git a/infra/net-aux/config/cloudflared/config.yaml b/infra/net-aux/config/cloudflared/config.yaml
index 592e883..30d96a9 100644
--- a/infra/net-aux/config/cloudflared/config.yaml
+++ b/infra/net-aux/config/cloudflared/config.yaml
@@ -12,31 +12,31 @@ ingress:
   - hostname: ssh.stonegarden.dev
     service: ssh://192.168.1.50:22
   - hostname: proxmox.euclid.stonegarden.dev
-    service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443
+    service: https://cilium-gateway-euclid.gateway.svc.cluster.local:443
     originRequest:
       originServerName: proxmox.euclid.stonegarden.dev
-  - hostname: haos.euclid.stonegarden.dev
-    service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443
+  - hostname: haos.stonegarden.dev
+    service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443
     originRequest:
-      originServerName: haos.euclid.stonegarden.dev
+      originServerName: haos.stonegarden.dev
   - hostname: blog.stonegarden.dev
-    service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443
+    service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443
     originRequest:
       originServerName: blog.stonegarden.dev
   - hostname: gateway.stonegarden.dev
-    service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443
+    service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443
     originRequest:
       originServerName: gateway.stonegarden.dev
   - hostname: hass.stonegarden.dev
-    service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443
+    service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443
     originRequest:
       originServerName: hass.stonegarden.dev
   - hostname: remark42.stonegarden.dev
-    service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443
+    service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443
     originRequest:
       originServerName: remark42.stonegarden.dev
   - hostname: stonegarden.dev
-    service: https://cilium-gateway-cilium-gateway.gateway.svc.cluster.local:443
+    service: https://cilium-gateway-stonegarden.gateway.svc.cluster.local:443
     originRequest:
       originServerName: stonegarden.dev
   - hostname: "*.stonegarden.dev"