diff --git a/packages/core/platform/templates/_helpers.tpl b/packages/core/platform/templates/_helpers.tpl
index 2c454177..684ee812 100644
--- a/packages/core/platform/templates/_helpers.tpl
+++ b/packages/core/platform/templates/_helpers.tpl
@@ -50,3 +50,19 @@ spec:
 {{- $root := index . 1 -}}
 {{- include "cozystack.platform.package.optional" (list $name "default" $root) }}
 {{ end }}
+
+{{/*
+Common system packages shared between isp-full and isp-full-generic bundles.
+Does NOT include: networking (variant differs), linstor (talos.enabled differs)
+*/}}
+{{- define "cozystack.platform.system.common-packages" -}}
+{{- $root := . -}}
+{{include "cozystack.platform.package.default" (list "cozystack.kubeovn-webhook" $root) }}
+{{include "cozystack.platform.package.default" (list "cozystack.kubeovn-plunger" $root) }}
+{{include "cozystack.platform.package.default" (list "cozystack.cozy-proxy" $root) }}
+{{include "cozystack.platform.package.default" (list "cozystack.multus" $root) }}
+{{include "cozystack.platform.package.default" (list "cozystack.metallb" $root) }}
+{{include "cozystack.platform.package.default" (list "cozystack.reloader" $root) }}
+{{include "cozystack.platform.package.default" (list "cozystack.linstor-scheduler" $root) }}
+{{include "cozystack.platform.package.default" (list "cozystack.snapshot-controller" $root) }}
+{{- end }}
diff --git a/packages/core/platform/templates/bundles/system.yaml b/packages/core/platform/templates/bundles/system.yaml
index d272962b..62f96521 100644
--- a/packages/core/platform/templates/bundles/system.yaml
+++ b/packages/core/platform/templates/bundles/system.yaml
@@ -23,15 +23,8 @@
 {{- $_ := set $networkingComponents "cilium" (dict "values" $ciliumValues) -}}
 {{- end -}}
 {{include "cozystack.platform.package" (list "cozystack.networking" "kubeovn-cilium" $ $networkingComponents) }}
-{{include "cozystack.platform.package.default" (list "cozystack.kubeovn-webhook" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.kubeovn-plunger" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.cozy-proxy" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.multus" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.metallb" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.reloader" $) }}
+{{include "cozystack.platform.system.common-packages" $ }}
 {{include "cozystack.platform.package.default" (list "cozystack.linstor" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.linstor-scheduler" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.snapshot-controller" $) }}
 {{- end }}
 
 {{- if eq .Values.bundles.system.variant "isp-hosted" }}
@@ -98,17 +91,10 @@
 {{- end -}}
 {{- /* Use kubeovn-cilium-generic variant (no values-talos.yaml) */ -}}
 {{include "cozystack.platform.package" (list "cozystack.networking" "kubeovn-cilium-generic" $ $networkingComponents) }}
-{{include "cozystack.platform.package.default" (list "cozystack.kubeovn-webhook" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.kubeovn-plunger" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.cozy-proxy" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.multus" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.metallb" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.reloader" $) }}
+{{include "cozystack.platform.system.common-packages" $ }}
 {{- /* Pass talos.enabled: false to linstor for generic Linux */ -}}
 {{- $linstorComponents := dict "linstor" (dict "values" (dict "talos" (dict "enabled" false))) -}}
 {{include "cozystack.platform.package" (list "cozystack.linstor" "default" $ $linstorComponents) }}
-{{include "cozystack.platform.package.default" (list "cozystack.linstor-scheduler" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.snapshot-controller" $) }}
 {{- end }}
 
 # Cozystack Engine