diff --git a/applications/add-ons/gateway-api.yaml b/applications/add-ons/gateway-api.yaml
new file mode 100644
index 0000000..2713643
--- /dev/null
+++ b/applications/add-ons/gateway-api.yaml
@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: gateway-api
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: https://github.com/kubernetes-sigs/gateway-api
+    targetRevision: v1.4.1
+    path: config/crd/standard
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: default
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
diff --git a/applications/add-ons/traefik.yaml b/applications/add-ons/traefik.yaml
new file mode 100644
index 0000000..70a8f07
--- /dev/null
+++ b/applications/add-ons/traefik.yaml
@@ -0,0 +1,54 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: traefik
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: https://traefik.github.io/charts
+    chart: traefik
+    targetRevision: v39.0.1
+    helm:
+      values: |
+        providers:
+          kubernetesGateway:
+            enabled: true
+
+        deployment:
+          replicas: 1
+          hostNetwork: true
+          dnsPolicy: ClusterFirstWithHostNet
+
+        service:
+          enabled: false
+
+        additionalArguments:
+          - --entrypoints.web.address=:80
+          - --entrypoints.websecure.address=:443
+
+        ports:
+          web:
+            port: 80
+            expose:
+              default: true
+            exposedPort: 80
+          websecure:
+            port: 443
+            expose:
+              default: true
+            exposedPort: 443
+          traefik:
+            port: 8000
+            expose:
+              default: false
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: traefik
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/applications/kustomization.yaml b/applications/kustomization.yaml
index c36caad..77befbf 100644
--- a/applications/kustomization.yaml
+++ b/applications/kustomization.yaml
@@ -2,4 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - services
+  # add-ons
+  - add-ons/gateway-api.yaml
+  - add-ons/traefik.yaml
+  # services
+  - services/app-autoregexbot.yaml
diff --git a/applications/services/kustomization.yaml b/applications/services/kustomization.yaml
deleted file mode 100644
index 48a9922..0000000
--- a/applications/services/kustomization.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - app-autoregexbot.yaml