diff --git a/packages/core/platform/templates/bundles/iaas.yaml b/packages/core/platform/templates/bundles/iaas.yaml
index 529ec67a2..7c856b8c0 100644
--- a/packages/core/platform/templates/bundles/iaas.yaml
+++ b/packages/core/platform/templates/bundles/iaas.yaml
@@ -1,7 +1,7 @@
-{{- if and .Values.bundles.iaas.enabled (ne .Values.bundles.system.variant "isp-full") }}
-{{- fail "bundles.iaas.enabled can only be true when bundles.system.variant is 'isp-full'" }}
+{{- if and .Values.bundles.iaas.enabled (not (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic"))) }}
+{{- fail "bundles.iaas.enabled can only be true when bundles.system.variant is 'isp-full' or 'isp-full-generic'" }}
 {{- end }}
-{{- if and .Values.bundles.iaas.enabled (eq .Values.bundles.system.variant "isp-full") }}
+{{- if and .Values.bundles.iaas.enabled (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic")) }}
 {{include "cozystack.platform.package.default" (list "cozystack.kubevirt" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.kubevirt-cdi" $) }}
 {{include "cozystack.platform.package.optional.default" (list "cozystack.gpu-operator" $) }}
diff --git a/packages/core/platform/templates/bundles/naas.yaml b/packages/core/platform/templates/bundles/naas.yaml
index 7c40a4aaa..9682d4470 100644
--- a/packages/core/platform/templates/bundles/naas.yaml
+++ b/packages/core/platform/templates/bundles/naas.yaml
@@ -1,7 +1,7 @@
-{{- if and .Values.bundles.naas.enabled (not (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-hosted"))) }}
-{{- fail "bundles.naas.enabled can only be true when bundles.system.variant is 'isp-full' or 'isp-hosted'" }}
+{{- if and .Values.bundles.naas.enabled (not (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic") (eq .Values.bundles.system.variant "isp-hosted"))) }}
+{{- fail "bundles.naas.enabled can only be true when bundles.system.variant is 'isp-full', 'isp-full-generic', or 'isp-hosted'" }}
 {{- end }}
-{{- if and .Values.bundles.naas.enabled (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-hosted")) }}
+{{- if and .Values.bundles.naas.enabled (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic") (eq .Values.bundles.system.variant "isp-hosted")) }}
 {{include "cozystack.platform.package.default" (list "cozystack.http-cache-application" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.tcp-balancer-application" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.vpn-application" $) }}
diff --git a/packages/core/platform/templates/bundles/paas.yaml b/packages/core/platform/templates/bundles/paas.yaml
index 890ca514b..359f0959e 100644
--- a/packages/core/platform/templates/bundles/paas.yaml
+++ b/packages/core/platform/templates/bundles/paas.yaml
@@ -1,7 +1,7 @@
-{{- if and .Values.bundles.paas.enabled (not (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-hosted"))) }}
-{{- fail "bundles.paas.enabled can only be true when bundles.system.variant is 'isp-full' or 'isp-hosted'" }}
+{{- if and .Values.bundles.paas.enabled (not (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic") (eq .Values.bundles.system.variant "isp-hosted"))) }}
+{{- fail "bundles.paas.enabled can only be true when bundles.system.variant is 'isp-full', 'isp-full-generic', or 'isp-hosted'" }}
 {{- end }}
-{{- if and .Values.bundles.paas.enabled (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-hosted")) }}
+{{- if and .Values.bundles.paas.enabled (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic") (eq .Values.bundles.system.variant "isp-hosted")) }}
 {{include "cozystack.platform.package.default" (list "cozystack.mariadb-operator" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.kafka-operator" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.clickhouse-operator" $) }}
diff --git a/packages/core/platform/values-isp-full-generic.yaml b/packages/core/platform/values-isp-full-generic.yaml
index 17ca19f38..d5515bab6 100644
--- a/packages/core/platform/values-isp-full-generic.yaml
+++ b/packages/core/platform/values-isp-full-generic.yaml
@@ -5,8 +5,8 @@ bundles:
     enabled: true
     variant: "isp-full-generic"
   iaas:
-    enabled: false
+    enabled: true
   paas:
-    enabled: false
+    enabled: true
   naas:
-    enabled: false
+    enabled: true