diff --git a/packages/core/platform/bundles/distro-full.yaml b/packages/core/platform/bundles/distro-full.yaml
deleted file mode 100644
index c17d829d..00000000
--- a/packages/core/platform/bundles/distro-full.yaml
+++ /dev/null
@@ -1,280 +0,0 @@
-{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
-{{- $clusterDomain := (index $cozyConfig.data "cluster-domain") | default "cozy.local" }}
-
-releases:
-- name: fluxcd-operator
-  releaseName: fluxcd-operator
-  chart: fluxcd-operator
-  namespace: cozy-fluxcd
-  privileged: true
-  dependsOn: []
-
-- name: fluxcd
-  releaseName: fluxcd
-  chart: fluxcd
-  namespace: cozy-fluxcd
-  dependsOn: [fluxcd-operator,cilium]
-  values:
-    flux-instance:
-      instance:
-        cluster:
-          domain: {{ $clusterDomain }}
-
-- name: cilium
-  releaseName: cilium
-  chart: cilium
-  namespace: cozy-cilium
-  privileged: true
-  dependsOn: []
-  valuesFiles:
-  - values.yaml
-  - values-talos.yaml
-  values:
-    cilium:
-      enableIPv4Masquerade: true
-      enableIdentityMark: true
-      ipv4NativeRoutingCIDR: "{{ index $cozyConfig.data "ipv4-pod-cidr" }}"
-      autoDirectNodeRoutes: true
-      routingMode: native
-
-- name: cilium-networkpolicy
-  releaseName: cilium-networkpolicy
-  chart: cilium-networkpolicy
-  namespace: cozy-cilium
-  privileged: true
-  dependsOn: [cilium]
-
-- name: cozy-proxy
-  releaseName: cozystack
-  chart: cozy-proxy
-  namespace: cozy-system
-  optional: true
-  dependsOn: [cilium]
-
-- name: cert-manager-crds
-  releaseName: cert-manager-crds
-  chart: cert-manager-crds
-  namespace: cozy-cert-manager
-  dependsOn: [cilium]
-
-- name: cozystack-controller
-  releaseName: cozystack-controller
-  chart: cozystack-controller
-  namespace: cozy-system
-  dependsOn: [cilium]
-  {{- if eq (index $cozyConfig.data "telemetry-enabled") "false" }}
-  values:
-    cozystackController:
-      disableTelemetry: true
-  {{- end }}
-
-- name: lineage-controller-webhook
-  releaseName: lineage-controller-webhook
-  chart: lineage-controller-webhook
-  namespace: cozy-system
-  dependsOn: [cozystack-controller,cilium,cert-manager]
-
-- name: cert-manager
-  releaseName: cert-manager
-  chart: cert-manager
-  namespace: cozy-cert-manager
-  dependsOn: [cert-manager-crds]
-
-- name: cert-manager-issuers
-  releaseName: cert-manager-issuers
-  chart: cert-manager-issuers
-  namespace: cozy-cert-manager
-  optional: true
-  dependsOn: [cilium,cert-manager]
-
-- name: victoria-metrics-operator
-  releaseName: victoria-metrics-operator
-  chart: victoria-metrics-operator
-  namespace: cozy-victoria-metrics-operator
-  optional: true
-  dependsOn: [cilium,cert-manager]
-
-- name: monitoring-agents
-  releaseName: monitoring-agents
-  chart: monitoring-agents
-  namespace: cozy-monitoring
-  privileged: true
-  optional: true
-  dependsOn: [cilium,victoria-metrics-operator]
-  values:
-    scrapeRules:
-      etcd:
-        enabled: true
-
-- name: metallb
-  releaseName: metallb
-  chart: metallb
-  namespace: cozy-metallb
-  privileged: true
-  dependsOn: [cilium]
-
-- name: etcd-operator
-  releaseName: etcd-operator
-  chart: etcd-operator
-  namespace: cozy-etcd-operator
-  optional: true
-  dependsOn: [cilium,cert-manager]
-
-- name: grafana-operator
-  releaseName: grafana-operator
-  chart: grafana-operator
-  namespace: cozy-grafana-operator
-  optional: true
-  dependsOn: [cilium]
-
-- name: mariadb-operator
-  releaseName: mariadb-operator
-  chart: mariadb-operator
-  namespace: cozy-mariadb-operator
-  optional: true
-  dependsOn: [cilium,cert-manager,victoria-metrics-operator]
-  values:
-    mariadb-operator:
-      clusterName: {{ $clusterDomain }}
-
-- name: postgres-operator
-  releaseName: postgres-operator
-  chart: postgres-operator
-  namespace: cozy-postgres-operator
-  optional: true
-  dependsOn: [cilium,cert-manager,victoria-metrics-operator]
-
-- name: kafka-operator
-  releaseName: kafka-operator
-  chart: kafka-operator
-  namespace: cozy-kafka-operator
-  optional: true
-  dependsOn: [cilium,victoria-metrics-operator]
-  values:
-    strimzi-kafka-operator:
-      kubernetesServiceDnsDomain: {{ $clusterDomain }}
-
-- name: clickhouse-operator
-  releaseName: clickhouse-operator
-  chart: clickhouse-operator
-  namespace: cozy-clickhouse-operator
-  optional: true
-  dependsOn: [cilium,victoria-metrics-operator]
-
-- name: foundationdb-operator
-  releaseName: foundationdb-operator
-  chart: foundationdb-operator
-  namespace: cozy-foundationdb-operator
-  optional: true
-  dependsOn: [cilium,cert-manager]
-
-- name: rabbitmq-operator
-  releaseName: rabbitmq-operator
-  chart: rabbitmq-operator
-  namespace: cozy-rabbitmq-operator
-  optional: true
-  dependsOn: [cilium]
-
-- name: redis-operator
-  releaseName: redis-operator
-  chart: redis-operator
-  namespace: cozy-redis-operator
-  optional: true
-  dependsOn: [cilium]
-
-- name: piraeus-operator
-  releaseName: piraeus-operator
-  chart: piraeus-operator
-  namespace: cozy-linstor
-  dependsOn: [cilium,cert-manager]
-
-- name: snapshot-controller
-  releaseName: snapshot-controller
-  chart: snapshot-controller
-  namespace: cozy-snapshot-controller
-  dependsOn: [cilium]
-
-- name: objectstorage-controller
-  releaseName: objectstorage-controller
-  chart: objectstorage-controller
-  namespace: cozy-objectstorage-controller
-  optional: true
-  dependsOn: [cilium]
-
-- name: linstor
-  releaseName: linstor
-  chart: linstor
-  namespace: cozy-linstor
-  privileged: true
-  dependsOn: [piraeus-operator,cilium,cert-manager,snapshot-controller]
-
-- name: nfs-driver
-  releaseName: nfs-driver
-  chart: nfs-driver
-  namespace: cozy-nfs-driver
-  privileged: true
-  dependsOn: [cilium]
-  optional: true
-
-- name: telepresence
-  releaseName: traffic-manager
-  chart: telepresence
-  namespace: cozy-telepresence
-  optional: true
-  dependsOn: []
-
-- name: external-dns
-  releaseName: external-dns
-  chart: external-dns
-  namespace: cozy-external-dns
-  optional: true
-  dependsOn: [cilium]
-
-- name: external-secrets-operator
-  releaseName: external-secrets-operator
-  chart: external-secrets-operator
-  namespace: cozy-external-secrets-operator
-  optional: true
-  dependsOn: [cilium]
-
-- name: keycloak
-  releaseName: keycloak
-  chart: keycloak
-  namespace: cozy-keycloak
-  optional: true
-  dependsOn: [postgres-operator]
-
-- name: keycloak-operator
-  releaseName: keycloak-operator
-  chart: keycloak-operator
-  namespace: cozy-keycloak
-  optional: true
-  dependsOn: [keycloak]
-
-- name: bootbox
-  releaseName: bootbox
-  chart: bootbox
-  namespace: cozy-bootbox
-  privileged: true
-  optional: true
-  dependsOn: [cilium]
-
-- name: reloader
-  releaseName: reloader
-  chart: reloader
-  namespace: cozy-reloader
-
-- name: velero
-  releaseName: velero
-  chart: velero
-  namespace: cozy-velero
-  privileged: true
-  optional: true
-  dependsOn: [cilium]
-
-- name: hetzner-robotlb
-  releaseName: robotlb
-  optional: true
-  chart: hetzner-robotlb
-  namespace: cozy-hetzner-robotlb
-  dependsOn: [cilium]
diff --git a/packages/core/platform/bundles/distro-hosted.yaml b/packages/core/platform/bundles/distro-hosted.yaml
deleted file mode 100644
index c6ca13cc..00000000
--- a/packages/core/platform/bundles/distro-hosted.yaml
+++ /dev/null
@@ -1,192 +0,0 @@
-{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
-{{- $clusterDomain := (index $cozyConfig.data "cluster-domain") | default "cozy.local" }}
-
-releases:
-- name: fluxcd-operator
-  releaseName: fluxcd-operator
-  chart: fluxcd-operator
-  namespace: cozy-fluxcd
-  privileged: true
-  dependsOn: []
-
-- name: fluxcd
-  releaseName: fluxcd
-  chart: fluxcd
-  namespace: cozy-fluxcd
-  dependsOn: [fluxcd-operator]
-  values:
-    flux-instance:
-      instance:
-        cluster:
-          domain: {{ $clusterDomain }}
-
-- name: cert-manager-crds
-  releaseName: cert-manager-crds
-  chart: cert-manager-crds
-  namespace: cozy-cert-manager
-  dependsOn: []
-
-- name: cozystack-controller
-  releaseName: cozystack-controller
-  chart: cozystack-controller
-  namespace: cozy-system
-  {{- if eq (index $cozyConfig.data "telemetry-enabled") "false" }}
-  values:
-    cozystackController:
-      disableTelemetry: true
-  {{- end }}
-
-- name: lineage-controller-webhook
-  releaseName: lineage-controller-webhook
-  chart: lineage-controller-webhook
-  namespace: cozy-system
-  dependsOn: [cozystack-controller,cert-manager]
-
-- name: cert-manager
-  releaseName: cert-manager
-  chart: cert-manager
-  namespace: cozy-cert-manager
-  dependsOn: [cert-manager-crds]
-
-- name: cert-manager-issuers
-  releaseName: cert-manager-issuers
-  chart: cert-manager-issuers
-  namespace: cozy-cert-manager
-  optional: true
-  dependsOn: [cert-manager]
-
-- name: victoria-metrics-operator
-  releaseName: victoria-metrics-operator
-  chart: victoria-metrics-operator
-  namespace: cozy-victoria-metrics-operator
-  optional: true
-  dependsOn: [cert-manager]
-
-- name: monitoring-agents
-  releaseName: monitoring-agents
-  chart: monitoring-agents
-  namespace: cozy-monitoring
-  privileged: true
-  optional: true
-  dependsOn: [victoria-metrics-operator]
-  values:
-    scrapeRules:
-      etcd:
-        enabled: true
-
-- name: etcd-operator
-  releaseName: etcd-operator
-  chart: etcd-operator
-  namespace: cozy-etcd-operator
-  optional: true
-  dependsOn: [cert-manager]
-
-- name: grafana-operator
-  releaseName: grafana-operator
-  chart: grafana-operator
-  namespace: cozy-grafana-operator
-  optional: true
-  dependsOn: []
-
-- name: mariadb-operator
-  releaseName: mariadb-operator
-  chart: mariadb-operator
-  namespace: cozy-mariadb-operator
-  optional: true
-  dependsOn: [victoria-metrics-operator]
-  values:
-    mariadb-operator:
-      clusterName: {{ $clusterDomain }}
-
-- name: postgres-operator
-  releaseName: postgres-operator
-  chart: postgres-operator
-  namespace: cozy-postgres-operator
-  optional: true
-  dependsOn: [victoria-metrics-operator]
-
-- name: kafka-operator
-  releaseName: kafka-operator
-  chart: kafka-operator
-  namespace: cozy-kafka-operator
-  optional: true
-  dependsOn: [victoria-metrics-operator]
-  values:
-    strimzi-kafka-operator:
-      kubernetesServiceDnsDomain: {{ $clusterDomain }}
-
-- name: clickhouse-operator
-  releaseName: clickhouse-operator
-  chart: clickhouse-operator
-  namespace: cozy-clickhouse-operator
-  optional: true
-  dependsOn: [victoria-metrics-operator]
-
-- name: foundationdb-operator
-  releaseName: foundationdb-operator
-  chart: foundationdb-operator
-  namespace: cozy-foundationdb-operator
-  optional: true
-  dependsOn: [cert-manager]
-
-- name: rabbitmq-operator
-  releaseName: rabbitmq-operator
-  chart: rabbitmq-operator
-  namespace: cozy-rabbitmq-operator
-  optional: true
-  dependsOn: []
-
-- name: redis-operator
-  releaseName: redis-operator
-  chart: redis-operator
-  namespace: cozy-redis-operator
-  optional: true
-  dependsOn: []
-
-- name: telepresence
-  releaseName: traffic-manager
-  chart: telepresence
-  namespace: cozy-telepresence
-  optional: true
-  dependsOn: []
-
-- name: external-dns
-  releaseName: external-dns
-  chart: external-dns
-  namespace: cozy-external-dns
-  optional: true
-  dependsOn: []
-
-- name: external-secrets-operator
-  releaseName: external-secrets-operator
-  chart: external-secrets-operator
-  namespace: cozy-external-secrets-operator
-  optional: true
-  dependsOn: []
-
-- name: keycloak
-  releaseName: keycloak
-  chart: keycloak
-  namespace: cozy-keycloak
-  optional: true
-  dependsOn: [postgres-operator]
-
-- name: keycloak-operator
-  releaseName: keycloak-operator
-  chart: keycloak-operator
-  namespace: cozy-keycloak
-  optional: true
-  dependsOn: [keycloak]
-
-- name: velero
-  releaseName: velero
-  chart: velero
-  namespace: cozy-velero
-  privileged: true
-  optional: true
-
-- name: hetzner-robotlb
-  releaseName: robotlb
-  optional: true
-  chart: hetzner-robotlb
-  namespace: cozy-hetzner-robotlb
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/bucket.yaml b/packages/core/platform/bundles/iaas/cozyrds/bucket.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/bucket.yaml
rename to packages/core/platform/bundles/iaas/cozyrds/bucket.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/kubernetes.yaml b/packages/core/platform/bundles/iaas/cozyrds/kubernetes.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/kubernetes.yaml
rename to packages/core/platform/bundles/iaas/cozyrds/kubernetes.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/virtual-machine.yaml b/packages/core/platform/bundles/iaas/cozyrds/virtual-machine.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/virtual-machine.yaml
rename to packages/core/platform/bundles/iaas/cozyrds/virtual-machine.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/virtualprivatecloud.yaml b/packages/core/platform/bundles/iaas/cozyrds/virtualprivatecloud.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/virtualprivatecloud.yaml
rename to packages/core/platform/bundles/iaas/cozyrds/virtualprivatecloud.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/vm-disk.yaml b/packages/core/platform/bundles/iaas/cozyrds/vm-disk.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/vm-disk.yaml
rename to packages/core/platform/bundles/iaas/cozyrds/vm-disk.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/vm-instance.yaml b/packages/core/platform/bundles/iaas/cozyrds/vm-instance.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/vm-instance.yaml
rename to packages/core/platform/bundles/iaas/cozyrds/vm-instance.yaml
diff --git a/packages/core/platform/bundles/iaas/system-iaas.yaml b/packages/core/platform/bundles/iaas/system-iaas.yaml
new file mode 100644
index 00000000..7286e0de
--- /dev/null
+++ b/packages/core/platform/bundles/iaas/system-iaas.yaml
@@ -0,0 +1,100 @@
+{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
+{{- $clusterDomain := (index $cozyConfig.data "cluster-domain") | default "cozy.local" }}
+{{- $oidcEnabled := index $cozyConfig.data "oidc-enabled" }}
+{{- $host := index $cozyConfig.data "root-host" }}
+{{- if not $host }}
+{{- fail "ERROR need root-host in cozystack ConfigMap" }}
+{{- end }}
+{{- $apiServerEndpoint := index $cozyConfig.data "api-server-endpoint" }}
+{{- if not $apiServerEndpoint }}
+{{- fail "ERROR need api-server-endpoint in cozystack ConfigMap" }}
+{{- end }}
+
+releases:
+- name: kubevirt-operator
+  releaseName: kubevirt-operator
+  chart: kubevirt-operator
+  namespace: cozy-kubevirt
+  dependsOn: [cilium,kubeovn,victoria-metrics-operator]
+
+- name: kubevirt
+  releaseName: kubevirt
+  chart: kubevirt
+  namespace: cozy-kubevirt
+  privileged: true
+  dependsOn: [cilium,kubeovn,kubevirt-operator]
+  {{- $cpuAllocationRatio := index $cozyConfig.data "cpu-allocation-ratio" }}
+  {{- if $cpuAllocationRatio }}
+  values:
+    cpuAllocationRatio: {{ $cpuAllocationRatio }}
+  {{- end }}
+
+- name: kubevirt-instancetypes
+  releaseName: kubevirt-instancetypes
+  chart: kubevirt-instancetypes
+  namespace: cozy-kubevirt
+  dependsOn: [cilium,kubeovn,kubevirt-operator,kubevirt]
+
+- name: kubevirt-cdi-operator
+  releaseName: kubevirt-cdi-operator
+  chart: kubevirt-cdi-operator
+  namespace: cozy-kubevirt-cdi
+  dependsOn: [cilium,kubeovn]
+
+- name: kubevirt-cdi
+  releaseName: kubevirt-cdi
+  chart: kubevirt-cdi
+  namespace: cozy-kubevirt-cdi
+  dependsOn: [cilium,kubeovn,kubevirt-cdi-operator]
+
+- name: gpu-operator
+  releaseName: gpu-operator
+  chart: gpu-operator
+  namespace: cozy-gpu-operator
+  privileged: true
+  optional: true
+  dependsOn: [cilium,kubeovn]
+  valuesFiles:
+  - values.yaml
+  - values-talos.yaml
+
+- name: kamaji
+  releaseName: kamaji
+  chart: kamaji
+  namespace: cozy-kamaji
+  dependsOn: [cilium,kubeovn,cert-manager]
+
+- name: capi-operator
+  releaseName: capi-operator
+  chart: capi-operator
+  namespace: cozy-cluster-api
+  privileged: true
+  dependsOn: [cilium,kubeovn,cert-manager]
+
+- name: capi-providers-bootstrap
+  releaseName: capi-providers-bootstrap
+  chart: capi-providers-bootstrap
+  namespace: cozy-cluster-api
+  privileged: true
+  dependsOn: [cilium,kubeovn,capi-operator]
+
+- name: capi-providers-core
+  releaseName: capi-providers-core
+  chart: capi-providers-core
+  namespace: cozy-cluster-api
+  privileged: true
+  dependsOn: [cilium,kubeovn,capi-operator]
+
+- name: capi-providers-cpprovider
+  releaseName: capi-providers-cpprovider
+  chart: capi-providers-cpprovider
+  namespace: cozy-cluster-api
+  privileged: true
+  dependsOn: [cilium,kubeovn,capi-operator]
+
+- name: capi-providers-infraprovider
+  releaseName: capi-providers-infraprovider
+  chart: capi-providers-infraprovider
+  namespace: cozy-cluster-api
+  privileged: true
+  dependsOn: [cilium,kubeovn,capi-operator]
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/http-cache.yaml b/packages/core/platform/bundles/naas/http-cache.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/http-cache.yaml
rename to packages/core/platform/bundles/naas/http-cache.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/tcp-balancer.yaml b/packages/core/platform/bundles/naas/tcp-balancer.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/tcp-balancer.yaml
rename to packages/core/platform/bundles/naas/tcp-balancer.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/vpn.yaml b/packages/core/platform/bundles/naas/vpn.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/vpn.yaml
rename to packages/core/platform/bundles/naas/vpn.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/clickhouse.yaml b/packages/core/platform/bundles/paas/cozyrds/clickhouse.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/clickhouse.yaml
rename to packages/core/platform/bundles/paas/cozyrds/clickhouse.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/ferretdb.yaml b/packages/core/platform/bundles/paas/cozyrds/ferretdb.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/ferretdb.yaml
rename to packages/core/platform/bundles/paas/cozyrds/ferretdb.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/foundationdb.yaml b/packages/core/platform/bundles/paas/cozyrds/foundationdb.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/foundationdb.yaml
rename to packages/core/platform/bundles/paas/cozyrds/foundationdb.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/kafka.yaml b/packages/core/platform/bundles/paas/cozyrds/kafka.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/kafka.yaml
rename to packages/core/platform/bundles/paas/cozyrds/kafka.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/mysql.yaml b/packages/core/platform/bundles/paas/cozyrds/mysql.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/mysql.yaml
rename to packages/core/platform/bundles/paas/cozyrds/mysql.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/nats.yaml b/packages/core/platform/bundles/paas/cozyrds/nats.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/nats.yaml
rename to packages/core/platform/bundles/paas/cozyrds/nats.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/postgres.yaml b/packages/core/platform/bundles/paas/cozyrds/postgres.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/postgres.yaml
rename to packages/core/platform/bundles/paas/cozyrds/postgres.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/rabbitmq.yaml b/packages/core/platform/bundles/paas/cozyrds/rabbitmq.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/rabbitmq.yaml
rename to packages/core/platform/bundles/paas/cozyrds/rabbitmq.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/redis.yaml b/packages/core/platform/bundles/paas/cozyrds/redis.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/redis.yaml
rename to packages/core/platform/bundles/paas/cozyrds/redis.yaml
diff --git a/packages/core/platform/bundles/paas/system-paas.yaml b/packages/core/platform/bundles/paas/system-paas.yaml
new file mode 100644
index 00000000..119402bd
--- /dev/null
+++ b/packages/core/platform/bundles/paas/system-paas.yaml
@@ -0,0 +1,53 @@
+{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
+{{- $clusterDomain := (index $cozyConfig.data "cluster-domain") | default "cozy.local" }}
+{{- $oidcEnabled := index $cozyConfig.data "oidc-enabled" }}
+{{- $host := index $cozyConfig.data "root-host" }}
+{{- if not $host }}
+{{- fail "ERROR need root-host in cozystack ConfigMap" }}
+{{- end }}
+{{- $apiServerEndpoint := index $cozyConfig.data "api-server-endpoint" }}
+{{- if not $apiServerEndpoint }}
+{{- fail "ERROR need api-server-endpoint in cozystack ConfigMap" }}
+{{- end }}
+
+- name: mariadb-operator
+  releaseName: mariadb-operator
+  chart: mariadb-operator
+  namespace: cozy-mariadb-operator
+  dependsOn: [cilium,kubeovn,cert-manager,victoria-metrics-operator]
+  values:
+    mariadb-operator:
+      clusterName: {{ $clusterDomain }}
+
+- name: kafka-operator
+  releaseName: kafka-operator
+  chart: kafka-operator
+  namespace: cozy-kafka-operator
+  dependsOn: [cilium,kubeovn,victoria-metrics-operator]
+  values:
+    strimzi-kafka-operator:
+      kubernetesServiceDnsDomain: {{ $clusterDomain }}
+
+- name: clickhouse-operator
+  releaseName: clickhouse-operator
+  chart: clickhouse-operator
+  namespace: cozy-clickhouse-operator
+  dependsOn: [cilium,kubeovn,victoria-metrics-operator]
+
+- name: foundationdb-operator
+  releaseName: foundationdb-operator
+  chart: foundationdb-operator
+  namespace: cozy-foundationdb-operator
+  dependsOn: [cilium,kubeovn,cert-manager]
+
+- name: rabbitmq-operator
+  releaseName: rabbitmq-operator
+  chart: rabbitmq-operator
+  namespace: cozy-rabbitmq-operator
+  dependsOn: [cilium,kubeovn]
+
+- name: redis-operator
+  releaseName: redis-operator
+  chart: redis-operator
+  namespace: cozy-redis-operator
+  dependsOn: [cilium,kubeovn]
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/bootbox.yaml b/packages/core/platform/bundles/system/cozyrds/bootbox.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/bootbox.yaml
rename to packages/core/platform/bundles/system/cozyrds/bootbox.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/etcd.yaml b/packages/core/platform/bundles/system/cozyrds/etcd.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/etcd.yaml
rename to packages/core/platform/bundles/system/cozyrds/etcd.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/info.yaml b/packages/core/platform/bundles/system/cozyrds/info.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/info.yaml
rename to packages/core/platform/bundles/system/cozyrds/info.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/ingress.yaml b/packages/core/platform/bundles/system/cozyrds/ingress.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/ingress.yaml
rename to packages/core/platform/bundles/system/cozyrds/ingress.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/monitoring.yaml b/packages/core/platform/bundles/system/cozyrds/monitoring.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/monitoring.yaml
rename to packages/core/platform/bundles/system/cozyrds/monitoring.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/seaweedfs.yaml b/packages/core/platform/bundles/system/cozyrds/seaweedfs.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/seaweedfs.yaml
rename to packages/core/platform/bundles/system/cozyrds/seaweedfs.yaml
diff --git a/packages/system/cozystack-resource-definitions/cozyrds/tenant.yaml b/packages/core/platform/bundles/system/cozyrds/tenant.yaml
similarity index 100%
rename from packages/system/cozystack-resource-definitions/cozyrds/tenant.yaml
rename to packages/core/platform/bundles/system/cozyrds/tenant.yaml
diff --git a/packages/core/platform/bundles/paas-full.yaml b/packages/core/platform/bundles/system/system-full.yaml
similarity index 71%
rename from packages/core/platform/bundles/paas-full.yaml
rename to packages/core/platform/bundles/system/system-full.yaml
index 48b5c3a4..f66437d5 100644
--- a/packages/core/platform/bundles/paas-full.yaml
+++ b/packages/core/platform/bundles/system/system-full.yaml
@@ -159,53 +159,6 @@ releases:
       etcd:
         enabled: true
 
-- name: kubevirt-operator
-  releaseName: kubevirt-operator
-  chart: kubevirt-operator
-  namespace: cozy-kubevirt
-  dependsOn: [cilium,kubeovn,victoria-metrics-operator]
-
-- name: kubevirt
-  releaseName: kubevirt
-  chart: kubevirt
-  namespace: cozy-kubevirt
-  privileged: true
-  dependsOn: [cilium,kubeovn,kubevirt-operator]
-  {{- $cpuAllocationRatio := index $cozyConfig.data "cpu-allocation-ratio" }}
-  {{- if $cpuAllocationRatio }}
-  values:
-    cpuAllocationRatio: {{ $cpuAllocationRatio }}
-  {{- end }}
-
-- name: kubevirt-instancetypes
-  releaseName: kubevirt-instancetypes
-  chart: kubevirt-instancetypes
-  namespace: cozy-kubevirt
-  dependsOn: [cilium,kubeovn,kubevirt-operator,kubevirt]
-
-- name: kubevirt-cdi-operator
-  releaseName: kubevirt-cdi-operator
-  chart: kubevirt-cdi-operator
-  namespace: cozy-kubevirt-cdi
-  dependsOn: [cilium,kubeovn]
-
-- name: kubevirt-cdi
-  releaseName: kubevirt-cdi
-  chart: kubevirt-cdi
-  namespace: cozy-kubevirt-cdi
-  dependsOn: [cilium,kubeovn,kubevirt-cdi-operator]
-
-- name: gpu-operator
-  releaseName: gpu-operator
-  chart: gpu-operator
-  namespace: cozy-gpu-operator
-  privileged: true
-  optional: true
-  dependsOn: [cilium,kubeovn]
-  valuesFiles:
-  - values.yaml
-  - values-talos.yaml
-
 - name: metallb
   releaseName: metallb
   chart: metallb
@@ -225,54 +178,12 @@ releases:
   namespace: cozy-grafana-operator
   dependsOn: [cilium,kubeovn]
 
-- name: mariadb-operator
-  releaseName: mariadb-operator
-  chart: mariadb-operator
-  namespace: cozy-mariadb-operator
-  dependsOn: [cilium,kubeovn,cert-manager,victoria-metrics-operator]
-  values:
-    mariadb-operator:
-      clusterName: {{ $clusterDomain }}
-
 - name: postgres-operator
   releaseName: postgres-operator
   chart: postgres-operator
   namespace: cozy-postgres-operator
   dependsOn: [cilium,kubeovn,cert-manager]
 
-- name: kafka-operator
-  releaseName: kafka-operator
-  chart: kafka-operator
-  namespace: cozy-kafka-operator
-  dependsOn: [cilium,kubeovn,victoria-metrics-operator]
-  values:
-    strimzi-kafka-operator:
-      kubernetesServiceDnsDomain: {{ $clusterDomain }}
-
-- name: clickhouse-operator
-  releaseName: clickhouse-operator
-  chart: clickhouse-operator
-  namespace: cozy-clickhouse-operator
-  dependsOn: [cilium,kubeovn,victoria-metrics-operator]
-
-- name: foundationdb-operator
-  releaseName: foundationdb-operator
-  chart: foundationdb-operator
-  namespace: cozy-foundationdb-operator
-  dependsOn: [cilium,kubeovn,cert-manager]
-
-- name: rabbitmq-operator
-  releaseName: rabbitmq-operator
-  chart: rabbitmq-operator
-  namespace: cozy-rabbitmq-operator
-  dependsOn: [cilium,kubeovn]
-
-- name: redis-operator
-  releaseName: redis-operator
-  chart: redis-operator
-  namespace: cozy-redis-operator
-  dependsOn: [cilium,kubeovn]
-
 - name: piraeus-operator
   releaseName: piraeus-operator
   chart: piraeus-operator
@@ -328,47 +239,6 @@ releases:
   - keycloak-configure
   {{- end }}
 
-- name: kamaji
-  releaseName: kamaji
-  chart: kamaji
-  namespace: cozy-kamaji
-  dependsOn: [cilium,kubeovn,cert-manager]
-
-- name: capi-operator
-  releaseName: capi-operator
-  chart: capi-operator
-  namespace: cozy-cluster-api
-  privileged: true
-  dependsOn: [cilium,kubeovn,cert-manager]
-
-- name: capi-providers-bootstrap
-  releaseName: capi-providers-bootstrap
-  chart: capi-providers-bootstrap
-  namespace: cozy-cluster-api
-  privileged: true
-  dependsOn: [cilium,kubeovn,capi-operator]
-
-- name: capi-providers-core
-  releaseName: capi-providers-core
-  chart: capi-providers-core
-  namespace: cozy-cluster-api
-  privileged: true
-  dependsOn: [cilium,kubeovn,capi-operator]
-
-- name: capi-providers-cpprovider
-  releaseName: capi-providers-cpprovider
-  chart: capi-providers-cpprovider
-  namespace: cozy-cluster-api
-  privileged: true
-  dependsOn: [cilium,kubeovn,capi-operator]
-
-- name: capi-providers-infraprovider
-  releaseName: capi-providers-infraprovider
-  chart: capi-providers-infraprovider
-  namespace: cozy-cluster-api
-  privileged: true
-  dependsOn: [cilium,kubeovn,capi-operator]
-
 - name: external-dns
   releaseName: external-dns
   chart: external-dns
diff --git a/packages/core/platform/bundles/paas-hosted.yaml b/packages/core/platform/bundles/system/system-hosted.yaml
similarity index 86%
rename from packages/core/platform/bundles/paas-hosted.yaml
rename to packages/core/platform/bundles/system/system-hosted.yaml
index f8f28527..1a06b6ee 100644
--- a/packages/core/platform/bundles/paas-hosted.yaml
+++ b/packages/core/platform/bundles/system/system-hosted.yaml
@@ -130,45 +130,6 @@ releases:
   namespace: cozy-postgres-operator
   dependsOn: [cert-manager,victoria-metrics-operator]
 
-- name: kafka-operator
-  releaseName: kafka-operator
-  chart: kafka-operator
-  namespace: cozy-kafka-operator
-  dependsOn: [victoria-metrics-operator]
-  values:
-    strimzi-kafka-operator:
-      kubernetesServiceDnsDomain: {{ $clusterDomain }}
-
-- name: clickhouse-operator
-  releaseName: clickhouse-operator
-  chart: clickhouse-operator
-  namespace: cozy-clickhouse-operator
-  dependsOn: [victoria-metrics-operator]
-
-- name: foundationdb-operator
-  releaseName: foundationdb-operator
-  chart: foundationdb-operator
-  namespace: cozy-foundationdb-operator
-  dependsOn: [cert-manager]
-
-- name: rabbitmq-operator
-  releaseName: rabbitmq-operator
-  chart: rabbitmq-operator
-  namespace: cozy-rabbitmq-operator
-  dependsOn: []
-
-- name: redis-operator
-  releaseName: redis-operator
-  chart: redis-operator
-  namespace: cozy-redis-operator
-  dependsOn: []
-
-- name: piraeus-operator
-  releaseName: piraeus-operator
-  chart: piraeus-operator
-  namespace: cozy-linstor
-  dependsOn: [cert-manager]
-
 - name: objectstorage-controller
   releaseName: objectstorage-controller
   chart: objectstorage-controller