diff --git a/01-crds/fleet.yaml b/01-gateway-api-crds/fleet.yaml
similarity index 100%
rename from 01-crds/fleet.yaml
rename to 01-gateway-api-crds/fleet.yaml
diff --git a/01-crds/kustomization.yaml b/01-gateway-api-crds/kustomization.yaml
similarity index 100%
rename from 01-crds/kustomization.yaml
rename to 01-gateway-api-crds/kustomization.yaml
diff --git a/02-kgateway-crds/fleet.yaml b/02-kgateway-crds/fleet.yaml
new file mode 100644
index 0000000..336da29
--- /dev/null
+++ b/02-kgateway-crds/fleet.yaml
@@ -0,0 +1,29 @@
+# deployments/01b-kgateway-crds/fleet.yaml
+kind: Bundle
+metadata:
+  name: kgateway-crds
+
+# Da du die offiziellen Gateway API CRDs (v1.4.0) schon hast, 
+# sollte dieses Bundle davon abhängen oder danach kommen.
+dependsOn:
+  - name: gateway-api-crds
+
+defaultNamespace: kgateway-system
+
+helm:
+  # OCI Unterstützung in Fleet
+  chart: oci://cr.kgateway.dev/kgateway-dev/charts/kgateway-crds
+  version: "v2.2.1"
+  
+  # Da es CRDs sind, ist es oft sicher, den Namespace automatisch zu erstellen
+  createNamespace: true
+  
+  # Falls der Chart spezielle Release-Namen erwartet
+  releaseName: kgateway-crds
+
+targetCustomizations:
+  - name: all-clusters
+    clusterSelector:
+      matchExpressions:
+        - key: bgp-cidr
+          operator: Exists
\ No newline at end of file
diff --git a/02-bgp-config/fleet.yaml b/03-bgp-config/fleet.yaml
similarity index 100%
rename from 02-bgp-config/fleet.yaml
rename to 03-bgp-config/fleet.yaml
diff --git a/02-bgp-config/templates/cilium-config.yaml b/03-bgp-config/templates/cilium-config.yaml
similarity index 100%
rename from 02-bgp-config/templates/cilium-config.yaml
rename to 03-bgp-config/templates/cilium-config.yaml
diff --git a/04-kgateway/fleet.yaml b/04-kgateway/fleet.yaml
new file mode 100644
index 0000000..7d2945a
--- /dev/null
+++ b/04-kgateway/fleet.yaml
@@ -0,0 +1,30 @@
+kind: Bundle
+metadata:
+  name: kgateway-controller
+
+# Hier wird die Kette geschlossen:
+dependsOn:
+  - name: bgp-config
+
+defaultNamespace: kgateway-system
+
+helm:
+  # Der eigentliche Controller-Chart aus der OCI-Registry
+  chart: oci://cr.kgateway.dev/kgateway-dev/charts/kgateway
+  version: "v2.2.1"
+  releaseName: kgateway
+  createNamespace: true
+  
+  # Hier kannst du globale Einstellungen für kgateway vornehmen
+  values:
+    # Falls du spezifische Einstellungen für die Gateway-Instanz brauchst
+    # oder Ressourcen-Limits setzen willst:
+    kgateway:
+      enabled: true
+
+targetCustomizations:
+  - name: all-clusters
+    clusterSelector:
+      matchExpressions:
+        - key: bgp-cidr
+          operator: Exists
\ No newline at end of file