diff --git a/gitops/argocd/bootstrap/crds/api-gateway/kustomization.yaml b/gitops/argocd/bootstrap/crds/gateway-api/kustomization.yaml
similarity index 83%
rename from gitops/argocd/bootstrap/crds/api-gateway/kustomization.yaml
rename to gitops/argocd/bootstrap/crds/gateway-api/kustomization.yaml
index f47c3c2ce9..059b243238 100644
--- a/gitops/argocd/bootstrap/crds/api-gateway/kustomization.yaml
+++ b/gitops/argocd/bootstrap/crds/gateway-api/kustomization.yaml
@@ -1,3 +1,4 @@
+---
 # Copyright (C) Nicolas Lamirault <nicolas.lamirault@gmail.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +15,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-- https://github.com/kubernetes-sigs/gateway-api//config/crd?timeout=120&ref=v1.0.0-rc2
+helmCharts:
+- name: gateway-api-crds
+  includeCRDs: true
+  releaseName: gateway-api-crds
+  version: 1.1.0
+  repo: oci://ghcr.io/portefaix/charts
diff --git a/gitops/argocd/bootstrap/crds/kustomization.yaml b/gitops/argocd/bootstrap/crds/kustomization.yaml
index efce265d46..e72a3cc4c3 100644
--- a/gitops/argocd/bootstrap/crds/kustomization.yaml
+++ b/gitops/argocd/bootstrap/crds/kustomization.yaml
@@ -18,8 +18,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-# - kube-prometheus-stack
-- sealed-secrets
 - cert-manager
+- gateway-api
 - opentelemetry
-- api-gateway
+- prometheus-operator
+- sealed-secrets
diff --git a/gitops/argocd/bootstrap/crds/kube-prometheus-stack/Chart.yaml b/gitops/argocd/bootstrap/crds/prometheus-operator/kustomization.yaml
similarity index 76%
rename from gitops/argocd/bootstrap/crds/kube-prometheus-stack/Chart.yaml
rename to gitops/argocd/bootstrap/crds/prometheus-operator/kustomization.yaml
index 764225e610..299361a32f 100644
--- a/gitops/argocd/bootstrap/crds/kube-prometheus-stack/Chart.yaml
+++ b/gitops/argocd/bootstrap/crds/prometheus-operator/kustomization.yaml
@@ -15,12 +15,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-apiVersion: v2
-type: application
-name: prometheus-operator-crds
-version: 1.0.0
-appVersion: 1.0.0
-dependencies:
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+helmCharts:
 - name: prometheus-operator-crds
-  repository: https://prometheus-community.github.io/helm-charts
-  version: 9.0.1
+  includeCRDs: true
+  releaseName: prometheus-operator-crds
+  version: 11.0.0
+  repo: https://prometheus-community.github.io/helm-charts