Repository: kubermatic/kubermatic
Pull request #14584: Migrate Cilium to static ApplicationDefinition YAML
Author: login: ahmedwaleedmalik
Labels: name: size/XXL
description: Denotes a PR that changes 1000+ lines, ignoring generated files.
name: lgtm
description: Indicates that a PR is ready to be merged.
name: approved
description: Indicates a PR has been approved by an approver from all required OWNERS files.
name: release-note-none
description: Denotes a PR that doesn't merit a release note.
name: dco-signoff: yes
description: Denotes that all commits in the pull request have the valid DCO signoff message.
name: sig/cluster-management
description: Denotes a PR or issue as being assigned to SIG Cluster Management.
name: sig/app-management
description: Denotes a PR or issue as being assigned to SIG App Management.
name: sig/networking
description: Denotes a PR or issue as being assigned to SIG Networking.
name: docs/none
description: Denotes a PR that doesn't need documentation (changes).
Created: 2025-05-21T10:24:52Z | Merged: 2025-05-21T14:46:02Z

**What this PR does / why we need it**:
This is a follow-up PR for https://github.com/kubermatic/kubermatic/pull/14509, building upon the changes from that PR, we are now also moving Cilium to use the system applications reconciliation instead of having dedicated code to deploy it.

**Which issue(s) this PR fixes**:
<!--optional, in `fixes #<issue number>` format, will close the issue(s) when PR gets merged-->
Fixes #14428 (the issue is not related to the core changes in this PR but it was literally one character change so I did this in the same PR)

**What type of PR is this?**
<!--
Add one of the following kinds:
/kind bug
/kind cleanup
/kind documentation
/kind feature
/kind design

Optionally add one or more of the following kinds if applicable:
/kind api-change
/kind deprecation
/kind failing-test
/kind flake
/kind regression
/kind chore
-->
/kind chore

**Special notes for your reviewer**:
I've set the release note as NONE since this is only an internal change regarding how we deploy Cilium. Which is not a user facing change IMO.

**Does this PR introduce a user-facing change? Then add your Release Note here**:
<!--
Write your release note. Release notes are being used to generate the changelog:
1. Enter your extended release note in the below block. If the PR requires additional action from users switching to the new release, include the string "action required".
2. If no release note is required, just write "NONE".
-->
```release-note
NONE
```

**Documentation**:
<!--
Please do one of the following options:
- Add a link to the existing documentation
- Add a link to the kubermatic/docs pull request
- If no documentation change is applicable then add:
  - TBD (documentation will be added later)
  - NONE (no documentation needed for this PR)
-->
```documentation
NONE
```


Linked issue #14428: Typo in cluster-autoscaler application's default values
The default values for the cluster-autoscaler application contain a typo:

```
- apiVersion: rbac.authorization.k8s.io/v1
  kind: ClusterRoleBinding
  metadata:
    name: cluster-autoscaler-clusterapi-cluser-autoscaler
```

Should be `cluster` (twice) instead of `cluser` (towards the end).

I figure this name isn't used anywhere, so at least the typo shouldn't break anything.

Just in case it's not clear where I'm seeing this:

![Image](https://github.com/user-attachments/assets/ffb6468d-9074-4249-a712-2a4a9c8c5433)
Linked issue comments: user: login: csengerszabo
created_at: 2025-05-07T10:12:31Z
body: /label sig/app-management
author_association: CONTRIBUTOR
user: login: wurbanski
created_at: 2025-05-07T10:17:01Z
body: Note: after fixing the typo there might be a leftover ClusterRoleBinding object with the old name, release notes for the fix should contain an action required to manually delete the leftover object.
author_association: CONTRIBUTOR
user: login: ahmedwaleedmalik
created_at: 2025-05-21T11:02:03Z
body: /assign
author_association: MEMBER

Diff:
diff --git a/.prow/applications-catalog.yaml b/.prow/applications-catalog.yaml
index f19b276c60c..d70e7808e07 100644
--- a/.prow/applications-catalog.yaml
+++ b/.prow/applications-catalog.yaml
@@ -105,7 +105,9 @@ presubmits:
               memory: 6Gi
 
   - name: pre-kubermatic-appcatalog-cluster-autoscaler
-    run_if_changed: "(pkg/ee/default-application-catalog/cluster-autoscaler.yaml)"
+    # We are testing changes for the cluster-autoscaler application definition and the system applications
+    # reconciler through the same job.
+    run_if_changed: "(pkg/applicationdefinitions)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/kubermatic.git"
     labels:
diff --git a/cmd/kubermatic-installer/cmd_mirror_images.go b/cmd/kubermatic-installer/cmd_mirror_images.go
index 97371bb0559..ba85d4b2ca1 100644
--- a/cmd/kubermatic-installer/cmd_mirror_images.go
+++ b/cmd/kubermatic-installer/cmd_mirror_images.go
@@ -332,8 +332,6 @@ func MirrorImagesFunc(logger *logrus.Logger, versions kubermaticversion.Versions
 			}
 
 			copyKubermaticConfig := kubermaticConfig.DeepCopy()
-			// force using default repos
-			copyKubermaticConfig.Spec.UserCluster.SystemApplications.HelmRepository = defaulting.DefaultSystemApplicationsHelmRepository
 
 			logger.Info("🚀 Getting images from system Applications Helm charts…")
 
@@ -342,8 +340,13 @@ func MirrorImagesFunc(logger *logrus.Logger, versions kubermaticversion.Versions
 					return err
 				}
 
+				chartRepository := sysChart.Template.Source.Helm.URL
+				if copyKubermaticConfig.Spec.UserCluster.SystemApplications.HelmRepository != "" {
+					chartRepository = copyKubermaticConfig.Spec.UserCluster.SystemApplications.HelmRepository
+				}
+
 				chartImage := fmt.Sprintf("%s/%s:%s",
-					defaulting.DefaultSystemApplicationsHelmRepository,
+					chartRepository,
 					sysChart.Template.Source.Helm.ChartName,
 					sysChart.Version,
 				)
diff --git a/codegen/godoc/main.go b/codegen/godoc/main.go
index 115d340bca9..8deb8006731 100644
--- a/codegen/godoc/main.go
+++ b/codegen/godoc/main.go
@@ -31,7 +31,7 @@ import (
 	"golang.org/x/tools/go/packages"
 
 	"k8c.io/kubermatic/v2/pkg/addon"
-	"k8c.io/kubermatic/v2/pkg/ee/applications"
+	"k8c.io/kubermatic/v2/pkg/applications/providers/template"
 	"k8c.io/kubermatic/v2/pkg/resources/prometheus"
 )
 
@@ -44,7 +44,7 @@ func main() {
 	}
 
 	// document application template data
-	if err := generate("zz_generated.applicationdata.go.txt", applications.TemplateData{}); err != nil {
+	if err := generate("zz_generated.applicationdata.go.txt", template.TemplateData{}); err != nil {
 		log.Fatalf("Failed to create documentation: %v", err)
 	}
 
diff --git a/pkg/applicationdefinitions/OWNERS b/pkg/applicationdefinitions/OWNERS
new file mode 100644
index 00000000000..1f93088e78e
--- /dev/null
+++ b/pkg/applicationdefinitions/OWNERS
@@ -0,0 +1,13 @@
+# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
+
+approvers:
+  - sig-app-management
+
+reviewers:
+  - sig-app-management
+
+labels:
+  - sig/app-management
+
+options:
+  no_parent_owners: true
diff --git a/pkg/applicationdefinitions/application_catalog.go b/pkg/applicationdefinitions/application_catalog.go
index 0b2e866e8a5..c60cc2a1232 100644
--- a/pkg/applicationdefinitions/application_catalog.go
+++ b/pkg/applicationdefinitions/application_catalog.go
@@ -24,7 +24,6 @@ import (
 
 	appskubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/apps.kubermatic/v1"
 	kubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/kubermatic/v1"
-	"k8c.io/kubermatic/v2/pkg/defaulting"
 	"k8c.io/kubermatic/v2/pkg/kubernetes"
 	kkpreconciling "k8c.io/kubermatic/v2/pkg/resources/reconciling"
 	"k8c.io/kubermatic/v2/pkg/resources/registry"
@@ -150,8 +149,6 @@ func updateApplicationDefinition(appDef *appskubermaticv1.ApplicationDefinition,
 	for i := range appDef.Spec.Versions {
 		if sysAppConfig.HelmRepository != "" {
 			appDef.Spec.Versions[i].Template.Source.Helm.URL = registry.ToOCIURL(sysAppConfig.HelmRepository)
-		} else {
-			appDef.Spec.Versions[i].Template.Source.Helm.URL = defaulting.SystemApplicationsHelmRepositoryFromConfig(&sysAppConfig)
 		}
 
 		if credentials != nil {
diff --git a/pkg/applicationdefinitions/embed.go b/pkg/applicationdefinitions/embed.go
index b6fb20123d3..5716914c919 100644
--- a/pkg/applicationdefinitions/embed.go
+++ b/pkg/applicationdefinitions/embed.go
@@ -21,20 +21,23 @@ import (
 	"io/fs"
 )
 
+const (
+	systemApplicationsDirectory = "system-applications"
+)
+
 //go:embed system-applications
 var f embed.FS
 
 func GetSysAppDefFiles() ([]fs.File, error) {
-	dirname := "system-applications"
 	files := []fs.File{}
-	entries, err := f.ReadDir(dirname)
+	entries, err := f.ReadDir(systemApplicationsDirectory)
 	if err != nil {
 		return nil, err
 	}
 
 	for _, entry := range entries {
 		if !entry.IsDir() {
-			file, err := f.Open(dirname + "/" + entry.Name())
+			file, err := f.Open(systemApplicationsDirectory + "/" + entry.Name())
 			if err != nil {
 				return nil, err
 			}
diff --git a/pkg/applicationdefinitions/system-applications/cilium.yaml b/pkg/applicationdefinitions/system-applications/cilium.yaml
new file mode 100644
index 00000000000..5bbdd45d224
--- /dev/null
+++ b/pkg/applicationdefinitions/system-applications/cilium.yaml
@@ -0,0 +1,163 @@
+# Copyright 2025 The Kubermatic Kubernetes Platform contributors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps.kubermatic.k8c.io/v1
+kind: ApplicationDefinition
+metadata:
+  labels:
+    apps.kubermatic.k8c.io/managed-by: kkp
+    apps.kubermatic.k8c.io/type: cni
+  name: cilium
+spec:
+  defaultValuesBlock: |
+    envoy:
+      enabled: false
+    hubble:
+      relay:
+        enabled: true
+      tls:
+        auto:
+          method: cronJob
+      ui:
+        enabled: true
+    operator:
+      replicas: 1
+  description: Cilium CNI - eBPF-based Networking, Security, and Observability
+  method: helm
+  selector: {}
+  versions:
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.13.0
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.13.0
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.13.3
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.13.3
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.13.4
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.13.4
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.13.6
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.13.6
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.13.7
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.13.7
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.13.8
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.13.8
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.13.14
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.13.14
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.14.1
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.14.1
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.14.2
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.14.2
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.14.3
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.14.3
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.14.9
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.14.9
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.14.16
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.14.16
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.15.3
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.15.3
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.15.10
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.15.10
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.15.16
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.15.16
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.16.6
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.16.6
+    - template:
+        source:
+          helm:
+            chartName: cilium
+            chartVersion: 1.16.9
+            url: oci://quay.io/kubermatic/helm-charts
+      version: 1.16.9
+  documentationURL: https://docs.cilium.io/en/stable/
+  sourceURL: https://github.com/cilium/cilium
+  logo: |+
+    <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   id="Layer_1"
   inkscape:version="0.92.3 (2405546, 2018-03-11)"
   sodipodi:docname="cilium-ar21.svg"
   x="0px"
   y="0px"
   viewBox="1.22 0.98 120 59.999999"
   xml:space="preserve"
   width="120"
   height="60"><metadata
   id="metadata42"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
   id="defs40" /><sodipodi:namedview
   pagecolor="#ffffff"
   bordercolor="#666666"
   borderopacity="1"
   objecttolerance="10"
   gridtolerance="10"
   guidetolerance="10"
   inkscape:pageopacity="0"
   inkscape:pageshadow="2"
   inkscape:window-width="1920"
   inkscape:window-height="1001"
   id="namedview38"
   showgrid="false"
   inkscape:zoom="8"
   inkscape:cx="68.566448"
   inkscape:cy="19.341511"
   inkscape:window-x="-9"
   inkscape:window-y="-9"
   inkscape:window-maximized="1"
   inkscape:current-layer="Layer_1" />
<style
   type="text/css"
   id="style2">
	.st0{fill:#373737;}
	.st1{fill:#E82429;}
	.st2{fill:#6289C6;}
	.st3{fill:#F9C515;}
	.st4{fill:#8061A9;}
	.st5{fill:#F17423;}
	.st6{fill:#97C93D;}
	.st7{fill:#CADD72;}
	.st8{fill:#1E2222;}
</style>

<g
   id="g882"
   transform="translate(-0.75717157)"><g
     transform="matrix(0.14240237,0,0,0.14240237,4.4894801,12.140166)"
     id="g3503">
	<g
   id="g3505">
		<g
   id="g3507">
			<path
   style="fill:#373737"
   inkscape:connector-curvature="0"
   d="M 189.8,92.9 H 144 l -23,39.8 22.9,39.4 h 45.9 l 22.9,-39.4 z m -6.1,68.4 H 150 l -16.8,-28.7 16.8,-29 h 33.7 l 16.8,29 z"
   class="st0"
   id="path3509" />
			<polygon
   style="fill:#e82429"
   points="133.2,132.7 150,161.3 183.7,161.3 200.6,132.7 183.7,103.3 150,103.3 "
   class="st1"
   id="polygon3511" />
		</g>
		<g
   id="g3513">
			<path
   style="fill:#373737"
   inkscape:connector-curvature="0"
   d="M 189.8,177.5 H 144 l -23,39.7 22.9,39.4 h 45.9 l 22.9,-39.4 z m -6.1,68.7 H 150 l -16.8,-28.7 16.8,-29 h 33.7 l 16.8,29 z"
   class="st0"
   id="path3515" />
			<polygon
   style="fill:#6289c6"
   points="133.2,217.2 150,246.2 183.7,246.2 200.6,217.2 183.7,188.2 150,188.2 "
   class="st2"
   id="polygon3517" />
		</g>
		<g
   id="g3519">
			<path
   style="fill:#373737"
   inkscape:connector-curvature="0"
   d="M 189.8,8 H 144 l -23,39.8 23,39.4 h 45.9 l 22.9,-39.4 z m -6.1,68.4 H 150 L 133.2,47.7 150,18.4 h 33.7 l 16.8,29 z"
   class="st0"
   id="path3521" />
			<polygon
   style="fill:#f9c515"
   points="133.2,47.8 150,76.4 183.7,76.4 200.6,47.8 183.7,18.4 150,18.4 "
   class="st3"
   id="polygon3523" />
		</g>
	</g>
	<g
   id="g3525">
		<g
   id="g3527">
			<path
   style="fill:#373737"
   inkscape:connector-curvature="0"
   d="m 264.3,135.5 h -45.5 l -22.9,39.8 22.9,39.4 h 45.9 l 22.9,-39.4 z m -6.1,68.5 h -33.7 l -16.8,-28.7 16.8,-29 h 33.7 l 16.8,29 z"
   class="st0"
   id="path3529" />
			<polygon
   style="fill:#8061a9"
   points="208.1,175.3 224.9,204 258.2,204 275.4,175.3 258.2,145.9 224.9,145.9 "
   class="st4"
   id="polygon3531" />
		</g>
		<g
   id="g3533">
			<path
   style="fill:#373737"
   inkscape:connector-curvature="0"
   d="m 264.3,50.6 h -45.5 l -22.9,39.4 22.9,39.4 h 45.9 L 287.6,90 Z m -6.1,68.5 h -33.7 l -16.8,-28.7 16.8,-29 h 33.7 l 16.8,29 z"
   class="st0"
   id="path3535" />
			<polygon
   style="fill:#f17423"
   points="208.1,90.4 224.9,119.1 258.2,119.1 275.4,90.4 258.2,61 224.9,61 "
   class="st5"
   id="polygon3537" />
		</g>
	</g>
	<g
   id="g3539">
		<g
   id="g3541">
			<path
   style="fill:#373737"
   inkscape:connector-curvature="0"
   d="M 114.9,135.5 H 69.4 l -22.9,39.8 22.9,39.4 h 45.9 l 22.9,-39.4 z M 108.8,204 H 75.5 l -16.8,-28.7 16.8,-29 h 33.7 l 16.8,29 z"
   class="st0"
   id="path3543" />
			<polygon
   style="fill:#97c93d"
   points="58.7,175.3 75.5,204 108.8,204 126,175.3 108.8,145.9 75.5,145.9 "
   class="st6"
   id="polygon3545" />
		</g>
		<g
   id="g3547">
			<path
   style="fill:#373737"
   inkscape:connector-curvature="0"
   d="M 114.9,50.6 H 69.4 L 46.5,90 69.4,129.4 h 45.9 L 138.2,90 Z m -6.1,68.5 H 75.5 L 58.7,90.4 75.5,61.4 h 33.7 l 16.8,29 z"
   class="st0"
   id="path3549" />
			<polygon
   style="fill:#cadd72"
   points="58.7,90.4 75.5,119.1 108.8,119.1 126,90.4 108.8,61 75.5,61 "
   class="st7"
   id="polygon3551" />
		</g>
	</g>
</g><g
     transform="matrix(0.15269312,0,0,0.15269312,54.514381,-25.340857)"
     id="g3553">
	<g
   id="g3555">
		<path
   style="fill:#1e2222"
   d="m 31.8,347.6 c 3.8,0 7.3,0.5 10.6,1.2 3.3,0.7 6.1,1.9 8.8,3.3 v 10.4 c -3.3,-1.2 -6.4,-2.1 -9.2,-2.8 -3.1,-0.7 -5.9,-1.2 -9,-1.2 -3.1,0 -6.1,0.5 -9.2,1.4 -3.1,0.9 -5.7,2.6 -8.3,5 -2.4,2.4 -4.3,5.4 -5.9,9.2 -1.4,3.8 -2.1,8.5 -2.1,14.2 0,4 0.5,7.8 1.7,11.4 1.2,3.5 2.8,6.4 5,9 2.2,2.6 5,4.5 8,5.9 3.3,1.4 7.1,2.1 11.4,2.1 3.1,0 6.1,-0.2 9.5,-0.9 3.1,-0.7 6.1,-1.7 9.2,-2.8 v 10.4 c -0.9,0.5 -2.1,1.2 -3.5,1.7 -1.4,0.5 -3.1,0.9 -5,1.4 -1.7,0.5 -3.5,0.7 -5.7,0.9 -1.9,0.2 -4,0.5 -5.9,0.5 -5.2,0 -9.9,-0.7 -14.7,-2.4 -4.5,-1.7 -8.5,-4 -12.1,-7.1 -3.3,-3.3 -6.1,-7.3 -8,-12.3 -1.9,-5 -3.1,-10.6 -3.1,-17.5 0,-5 0.5,-9.5 1.7,-13.5 0.9,-4 2.4,-7.6 4.3,-10.6 1.9,-3 4,-5.7 6.4,-7.8 2.4,-2.1 5,-3.8 7.8,-5.2 2.8,-1.4 5.7,-2.4 8.5,-3.1 3.1,-0.3 5.9,-0.8 8.8,-0.8 z"
   class="st8"
   inkscape:connector-curvature="0"
   id="path3557" />
		<path
   style="fill:#1e2222"
   d="M 71.5,332 V 318 H 84 v 14 z m 0.2,93.9 v -76.2 h 12.5 v 76.2 z"
   class="st8"
   inkscape:connector-curvature="0"
   id="path3559" />
		<path
   style="fill:#1e2222"
   d="M 109.8,425.9 V 309.8 h 12.5 v 116.1 z"
   class="st8"
   inkscape:connector-curvature="0"
   id="path3561" />
		<path
   style="fill:#1e2222"
   d="m 147.7,332 v -14 h 12.5 v 14 z m 0.2,93.9 v -76.2 h 12.5 v 76.2 z"
   class="st8"
   inkscape:connector-curvature="0"
   id="path3563" />
		<path
   style="fill:#1e2222"
   d="m 215.6,427.8 c -4,0 -7.6,-0.5 -10.6,-1.2 -3.1,-0.9 -5.9,-2.1 -8.3,-3.5 -2.4,-1.7 -4.5,-3.3 -6.1,-5.7 -1.7,-2.1 -3.1,-4.5 -4,-7.1 -0.7,-1.9 -1.2,-4 -1.7,-6.4 -0.2,-2.4 -0.5,-4.7 -0.5,-7.6 v -46.6 h 12.5 v 46.6 c 0,4.3 0.5,7.8 1.7,10.6 1.2,3.3 3.3,5.7 6.1,7.6 2.8,1.9 6.6,2.8 10.9,2.8 4.7,0 8.5,-0.9 11.4,-3.1 2.8,-2.1 5,-4.7 6.1,-8.3 0.9,-2.6 1.4,-5.9 1.4,-9.7 V 349.6 H 247 v 46.8 c 0,2.6 -0.2,5 -0.5,7.1 -0.2,2.1 -0.7,4.3 -1.4,6.1 -0.9,2.6 -2.4,5 -4,7.3 -1.7,2.1 -3.8,4 -6.1,5.7 -2.4,1.7 -5.2,2.8 -8.5,3.8 -3.4,0.9 -6.9,1.4 -10.9,1.4 z"
   class="st8"
   inkscape:connector-curvature="0"
   id="path3565" />
		<path
   style="fill:#1e2222"
   d="m 332.4,425.9 h -12.5 v -49 c 0,-3.3 -0.5,-6.1 -1.2,-8.5 -0.7,-2.4 -1.7,-4.3 -3.1,-5.7 -1.4,-1.4 -3.1,-2.6 -5,-3.3 -1.9,-0.7 -4,-0.9 -6.4,-0.9 -4.5,0 -8.5,1.2 -12.1,3.5 -3.5,2.4 -6.9,5.7 -9.7,9.9 v 54.2 H 270 v -76.4 h 9.7 l 2.4,10.6 h 0.2 c 1.4,-1.7 2.8,-3.3 4.5,-5 1.7,-1.4 3.5,-2.8 5.4,-4 1.9,-1.2 4.3,-2.1 6.6,-2.6 2.4,-0.7 5,-0.9 7.8,-0.9 5.7,0 10.4,1.4 14.2,4 3.8,2.8 6.6,6.4 8.8,11.1 h 0.2 c 3.3,-4.7 7.3,-8.5 11.6,-11.1 4.3,-2.6 9.5,-4 15.1,-4 2.6,0 5.4,0.5 8.5,1.2 3.1,0.7 5.7,2.1 8.3,4 2.6,1.9 4.5,4.7 6.1,8.3 1.7,3.5 2.6,8 2.6,13.7 v 51.1 H 370 V 377 c 0,-3.3 -0.5,-6.1 -1.2,-8.5 -0.7,-2.4 -1.7,-4.3 -3.1,-5.7 -1.4,-1.4 -3.1,-2.6 -5,-3.3 -1.9,-0.7 -4,-0.9 -6.4,-0.9 -4.5,0 -8.5,1.2 -12.1,3.5 -3.5,2.4 -6.9,5.7 -9.9,9.9 z"
   class="st8"
   inkscape:connector-curvature="0"
   id="path3567" />
	</g>
</g></g>
</svg>
+  logoFormat: svg+xml
diff --git a/pkg/applicationdefinitions/system-applications/cluster-autoscaler-app.yaml b/pkg/applicationdefinitions/system-applications/cluster-autoscaler.yaml
similarity index 99%
rename from pkg/applicationdefinitions/system-applications/cluster-autoscaler-app.yaml
rename to pkg/applicationdefinitions/system-applications/cluster-autoscaler.yaml
index 8240bade130..bbeb313f7d0 100644
--- a/pkg/applicationdefinitions/system-applications/cluster-autoscaler-app.yaml
+++ b/pkg/applicationdefinitions/system-applications/cluster-autoscaler.yaml
@@ -73,7 +73,7 @@ spec:
     - apiVersion: rbac.authorization.k8s.io/v1
       kind: ClusterRoleBinding
       metadata:
-        name: cluster-autoscaler-clusterapi-cluser-autoscaler
+        name: cluster-autoscaler-clusterapi-cluster-autoscaler
       roleRef:
         apiGroup: rbac.authorization.k8s.io
         kind: ClusterRole
diff --git a/pkg/applications/providers/template/helm.go b/pkg/applications/providers/template/helm.go
index aff3f978a36..6b281addad7 100644
--- a/pkg/applications/providers/template/helm.go
+++ b/pkg/applications/providers/template/helm.go
@@ -291,3 +291,12 @@ func (h HelmTemplate) Rollback(applicationInstallation *appskubermaticv1.Applica
 
 	return helmClient.Rollback(getReleaseName(applicationInstallation))
 }
+
+func (h *HelmTemplate) templatePreDefinedValues(applicationValues map[string]any) (map[string]any, error) {
+	templateData, err := GetTemplateData(h.Ctx, h.SeedClient, h.ClusterName)
+
+	if err != nil {
+		return nil, err
+	}
+	return RenderValueTemplate(applicationValues, templateData)
+}
diff --git a/pkg/ee/applications/util.go b/pkg/applications/providers/template/util.go
similarity index 81%
rename from pkg/ee/applications/util.go
rename to pkg/applications/providers/template/util.go
index 026d9811538..1d0e8bb37a5 100644
--- a/pkg/ee/applications/util.go
+++ b/pkg/applications/providers/template/util.go
@@ -1,26 +1,20 @@
 /*
-                  Kubermatic Enterprise Read-Only License
-                         Version 1.0 ("KERO-1.0”)
-                     Copyright © 2025 Kubermatic GmbH
-
-   1.	You may only view, read and display for studying purposes the source
-      code of the software licensed under this license, and, to the extent
-      explicitly provided under this license, the binary code.
-   2.	Any use of the software which exceeds the foregoing right, including,
-      without limitation, its execution, compilation, copying, modification
-      and distribution, is expressly prohibited.
-   3.	THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-      IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-      TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-      SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-   END OF TERMS AND CONDITIONS
+Copyright 2025 The Kubermatic Kubernetes Platform contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
-package applications
+package template
 
 import (
 	"bytes"
@@ -114,7 +108,7 @@ func GetTemplateData(ctx context.Context, seedClient ctrlruntimeclient.Client, c
 		clusterVersion = cluster.Spec.Version.Semver()
 	}
 	if clusterVersion != nil {
-		clusterAutoscalerVersion, err := getAutoscalerImageTag(fmt.Sprintf("%d.%d", clusterVersion.Major(), clusterVersion.Minor()))
+		clusterAutoscalerVersion, err := GetAutoscalerImageTag(fmt.Sprintf("%d.%d", clusterVersion.Major(), clusterVersion.Minor()))
 		if err != nil {
 			return nil, fmt.Errorf("failed to parse autoscaler version for cluster %q", clusterName)
 		}
@@ -160,7 +154,7 @@ func RenderValueTemplate(applicationValues map[string]interface{}, templateData
 	return parsedMap, nil
 }
 
-func getAutoscalerImageTag(majorMinorVersion string) (string, error) {
+func GetAutoscalerImageTag(majorMinorVersion string) (string, error) {
 	switch majorMinorVersion {
 	case "1.29":
 		return "v1.29.5", nil
diff --git a/pkg/ee/applications/util_test.go b/pkg/applications/providers/template/util_test.go
similarity index 86%
rename from pkg/ee/applications/util_test.go
rename to pkg/applications/providers/template/util_test.go
index 1f1b7d0cfbb..3ba7a0df6ce 100644
--- a/pkg/ee/applications/util_test.go
+++ b/pkg/applications/providers/template/util_test.go
@@ -1,26 +1,20 @@
 /*
-                  Kubermatic Enterprise Read-Only License
-                         Version 1.0 ("KERO-1.0”)
-                     Copyright © 2025 Kubermatic GmbH
+Copyright 2025 The Kubermatic Kubernetes Platform contributors.
 
-   1.	You may only view, read and display for studying purposes the source
-      code of the software licensed under this license, and, to the extent
-      explicitly provided under this license, the binary code.
-   2.	Any use of the software which exceeds the foregoing right, including,
-      without limitation, its execution, compilation, copying, modification
-      and distribution, is expressly prohibited.
-   3.	THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
-      EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-      IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-      CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-      TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-      SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-   END OF TERMS AND CONDITIONS
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
-package applications
+package template
 
 import (
 	"context"
diff --git a/pkg/applications/providers/template/wrappers_ce.go b/pkg/applications/providers/template/wrappers_ce.go
deleted file mode 100644
index 174fdddab27..00000000000
--- a/pkg/applications/providers/template/wrappers_ce.go
+++ /dev/null
@@ -1,23 +0,0 @@
-//go:build !ee
-
-/*
-Copyright 2025 The Kubermatic Kubernetes Platform contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package template
-
-func (h *HelmTemplate) templatePreDefinedValues(applicationValues map[string]any) (map[string]any, error) {
-	return applicationValues, nil
-}
diff --git a/pkg/applications/providers/template/wrappers_ee.go b/pkg/applications/providers/template/wrappers_ee.go
deleted file mode 100644
index 8e0140c1d98..00000000000
--- a/pkg/applications/providers/template/wrappers_ee.go
+++ /dev/null
@@ -1,32 +0,0 @@
-//go:build ee
-
-/*
-Copyright 2025 The Kubermatic Kubernetes Platform contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package template
-
-import (
-	eeutil "k8c.io/kubermatic/v2/pkg/ee/applications"
-)
-
-func (h *HelmTemplate) templatePreDefinedValues(applicationValues map[string]any) (map[string]any, error) {
-	templateData, err := eeutil.GetTemplateData(h.Ctx, h.SeedClient, h.ClusterName)
-
-	if err != nil {
-		return nil, err
-	}
-	return eeutil.RenderValueTemplate(applicationValues, templateData)
-}
diff --git a/pkg/cni/cilium/cilium.go b/pkg/cni/cilium/cilium.go
deleted file mode 100644
index 7e584098065..00000000000
--- a/pkg/cni/cilium/cilium.go
+++ /dev/null
@@ -1,619 +0,0 @@
-/*
-Copyright 2022 The Kubermatic Kubernetes Platform contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cilium
-
-import (
-	"fmt"
-	"maps"
-	"strings"
-
-	appskubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/apps.kubermatic/v1"
-	kubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/kubermatic/v1"
-	"k8c.io/kubermatic/v2/pkg/defaulting"
-	"k8c.io/kubermatic/v2/pkg/resources"
-	"k8c.io/kubermatic/v2/pkg/resources/reconciling"
-	"k8c.io/kubermatic/v2/pkg/resources/registry"
-
-	"k8s.io/apimachinery/pkg/util/validation/field"
-	"sigs.k8s.io/yaml"
-)
-
-const (
-	ciliumHelmChartName = "cilium"
-	ciliumImageRegistry = "quay.io/cilium/"
-)
-
-// ApplicationDefinitionReconciler creates Cilium ApplicationDefinition managed by KKP to be used
-// for installing Cilium CNI into KKP user clusters.
-func ApplicationDefinitionReconciler(config *kubermaticv1.KubermaticConfiguration) reconciling.NamedApplicationDefinitionReconcilerFactory {
-	return func() (string, reconciling.ApplicationDefinitionReconciler) {
-		return kubermaticv1.CNIPluginTypeCilium.String(), func(app *appskubermaticv1.ApplicationDefinition) (*appskubermaticv1.ApplicationDefinition, error) {
-			app.Labels = map[string]string{
-				appskubermaticv1.ApplicationManagedByLabel: appskubermaticv1.ApplicationManagedByKKPValue,
-				appskubermaticv1.ApplicationTypeLabel:      appskubermaticv1.ApplicationTypeCNIValue,
-			}
-
-			app.Spec.Description = "Cilium CNI - eBPF-based Networking, Security, and Observability"
-			app.Spec.Method = appskubermaticv1.HelmTemplateMethod
-
-			var credentials *appskubermaticv1.HelmCredentials
-			if config.Spec.UserCluster.SystemApplications.HelmRegistryConfigFile != nil {
-				credentials = &appskubermaticv1.HelmCredentials{
-					RegistryConfigFile: config.Spec.UserCluster.SystemApplications.HelmRegistryConfigFile,
-				}
-			}
-
-			defaultHelmRepository := defaulting.SystemApplicationsHelmRepositoryFromConfig(&config.Spec.UserCluster.SystemApplications)
-
-			app.Spec.Versions = []appskubermaticv1.ApplicationVersion{
-				// NOTE: When introducing a new version, make sure it is:
-				//  - introduced in pkg/cni/version.go with the version string exactly matching the Spec.Versions.Version here
-				//  - Helm chart is mirrored in Kubermatic OCI registry, use the script cilium-mirror-chart.sh
-				{
-					Version: "1.13.0",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.13.0",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.13.3",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.13.3",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.13.4",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.13.4",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.13.6",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.13.6",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.13.7",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.13.7",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.13.8",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.13.8",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.13.14",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.13.14",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.14.1",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.14.1",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.14.2",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.14.2",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.14.3",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.14.3",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.14.9",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.14.9",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.14.16",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.14.16",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.15.3",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.15.3",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.15.10",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.15.10",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.15.16",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.15.16",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.16.6",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.16.6",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-				{
-					Version: "1.16.9",
-					Template: appskubermaticv1.ApplicationTemplate{
-						Source: appskubermaticv1.ApplicationSource{
-							Helm: &appskubermaticv1.HelmSource{
-								ChartName:    ciliumHelmChartName,
-								ChartVersion: "1.16.9",
-								URL:          defaultHelmRepository,
-								Credentials:  credentials,
-							},
-						},
-					},
-				},
-			}
-
-			// to make it compatible with older cilium controller versions, convert any DefaultValues into DefaultValuesBlock
-			if err := convertDefaultValuesToDefaultValuesBlock(app); err != nil {
-				return app, fmt.Errorf("failed to convert DefaultValues into DefaultValuesBlock: %w", err)
-			}
-
-			// we want to allow overriding the default values, so reconcile them only if nil
-			if app.Spec.DefaultValuesBlock == "" || app.Spec.DefaultValuesBlock == "{}" {
-				if err := setDefaultValues(app); err != nil {
-					return app, err
-				}
-				return app, nil
-			}
-
-			defaultValues, err := app.Spec.GetParsedDefaultValues()
-			if err != nil {
-				return app, fmt.Errorf("failed to unmarshal CNI values: %w", err)
-			}
-
-			if defaultValues != nil {
-				sanitizeValues(defaultValues)
-				rawValues, err := yaml.Marshal(defaultValues)
-				if err != nil {
-					return app, fmt.Errorf("failed to marshal CNI values: %w", err)
-				}
-
-				app.Spec.DefaultValuesBlock = string(rawValues)
-			}
-
-			return app, nil
-		}
-	}
-}
-
-// setDefaultValues sets the default values for the application.
-func setDefaultValues(app *appskubermaticv1.ApplicationDefinition) error {
-	defaultValues := map[string]any{
-		"operator": map[string]any{
-			"replicas": 1,
-		},
-		"envoy": map[string]any{
-			"enabled": false,
-		},
-		"hubble": map[string]any{
-			"relay": map[string]any{
-				"enabled": true,
-			},
-			"ui": map[string]any{
-				"enabled": true,
-			},
-			"tls": map[string]any{
-				"auto": map[string]any{
-					"method": "cronJob",
-				},
-			},
-		},
-	}
-	rawValues, err := yaml.Marshal(defaultValues)
-	if err != nil {
-		return fmt.Errorf("failed to marshal default CNI values: %w", err)
-	}
-	app.Spec.DefaultValuesBlock = string(rawValues)
-	return nil
-}
-
-func sanitizeValues(values map[string]any) {
-	// If not specified, set envoy.enabled to false
-	// https://github.com/cilium/cilium/commit/471f19a16593e1e9342c31bf3e26e5383737cb0a
-	if envoy, ok := values["envoy"].(map[string]any); ok {
-		if _, ok := envoy["enabled"]; !ok {
-			envoy["enabled"] = false
-		}
-	} else {
-		values["envoy"] = map[string]any{
-			"enabled": false,
-		}
-	}
-}
-
-// GetAppInstallOverrideValues returns Helm values to be enforced on the cluster's ApplicationInstallation
-// of the Cilium CNI managed by KKP.
-func GetAppInstallOverrideValues(cluster *kubermaticv1.Cluster, overwriteRegistry string) map[string]any {
-	podSecurityContext := map[string]any{
-		"seccompProfile": map[string]any{
-			"type": "RuntimeDefault",
-		},
-	}
-	defaultValues := map[string]any{
-		"podSecurityContext": podSecurityContext,
-	}
-	values := map[string]any{
-		"podSecurityContext": podSecurityContext,
-	}
-	valuesEnvoy := map[string]any{
-		"podSecurityContext": podSecurityContext,
-	}
-
-	valuesOperator := map[string]any{
-		"securityContext": map[string]any{
-			"seccompProfile": map[string]any{
-				"type": "RuntimeDefault",
-			},
-		},
-		"podSecurityContext": podSecurityContext,
-	}
-	valuesCni := map[string]any{
-		// we run Cilium as non-exclusive CNI to allow for Multus use-cases
-		"exclusive": false,
-	}
-
-	valuesCertGen := maps.Clone(defaultValues)
-	valuesRelay := maps.Clone(defaultValues)
-	valuesFrontend := map[string]any{}
-	valuesBackend := map[string]any{}
-
-	if cluster.Spec.ClusterNetwork.ProxyMode == resources.EBPFProxyMode {
-		values["kubeProxyReplacement"] = "true"
-		values["k8sServiceHost"] = cluster.Status.Address.ExternalName
-		values["k8sServicePort"] = cluster.Status.Address.Port
-
-		nodePortRange := cluster.Spec.ComponentsOverride.Apiserver.NodePortRange
-		if nodePortRange != "" && nodePortRange != resources.DefaultNodePortRange {
-			values["nodePort"] = map[string]any{
-				"range": strings.ReplaceAll(nodePortRange, "-", ","),
-			}
-		}
-	} else {
-		values["kubeProxyReplacement"] = "false"
-		values["sessionAffinity"] = true
-		valuesCni["chainingMode"] = "portmap"
-	}
-
-	ipamOperator := map[string]any{
-		"clusterPoolIPv4PodCIDRList": cluster.Spec.ClusterNetwork.Pods.GetIPv4CIDRs(),
-	}
-
-	if cluster.Spec.ClusterNetwork.NodeCIDRMaskSizeIPv4 != nil {
-		ipamOperator["clusterPoolIPv4MaskSize"] = *cluster.Spec.ClusterNetwork.NodeCIDRMaskSizeIPv4
-	}
-
-	if cluster.IsDualStack() {
-		values["ipv6"] = map[string]any{"enabled": true}
-		ipamOperator["clusterPoolIPv6PodCIDRList"] = cluster.Spec.ClusterNetwork.Pods.GetIPv6CIDRs()
-		if cluster.Spec.ClusterNetwork.NodeCIDRMaskSizeIPv6 != nil {
-			ipamOperator["clusterPoolIPv6MaskSize"] = *cluster.Spec.ClusterNetwork.NodeCIDRMaskSizeIPv6
-		}
-	}
-
-	values["ipam"] = map[string]any{"operator": ipamOperator}
-
-	// Override images if registry override is configured
-	if overwriteRegistry != "" {
-		values["image"] = map[string]any{
-			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"cilium", overwriteRegistry)),
-			"useDigest":  false,
-		}
-		valuesOperator["image"] = map[string]any{
-			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"operator", overwriteRegistry)),
-			"useDigest":  false,
-		}
-		valuesRelay["image"] = map[string]any{
-			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"hubble-relay", overwriteRegistry)),
-			"useDigest":  false,
-		}
-		valuesBackend["image"] = map[string]any{
-			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"hubble-ui-backend", overwriteRegistry)),
-			"useDigest":  false,
-		}
-		valuesFrontend["image"] = map[string]any{
-			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"hubble-ui", overwriteRegistry)),
-			"useDigest":  false,
-		}
-		valuesCertGen["image"] = map[string]any{
-			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"certgen", overwriteRegistry)),
-			"useDigest":  false,
-		}
-		valuesEnvoy["image"] = map[string]any{
-			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"cilium-envoy", overwriteRegistry)),
-			"useDigest":  false,
-		}
-	}
-
-	uiSecContext := maps.Clone(podSecurityContext)
-	uiSecContext["enabled"] = true
-
-	values["cni"] = valuesCni
-	values["envoy"] = valuesEnvoy
-	values["operator"] = valuesOperator
-	values["certgen"] = valuesCertGen
-	values["hubble"] = map[string]any{
-		"relay": valuesRelay,
-		"ui": map[string]any{
-			"securityContext": uiSecContext,
-			"frontend":        valuesFrontend,
-			"backend":         valuesBackend,
-		},
-	}
-
-	return values
-}
-
-// ValidateValuesUpdate validates the update operation on provided Cilium Helm values.
-func ValidateValuesUpdate(newValues, oldValues map[string]any, fieldPath *field.Path) field.ErrorList {
-	allErrs := field.ErrorList{}
-	// Validate immutability of specific top-level value subtrees, managed solely by KKP
-	exclusions := []exclusion{
-		{
-			fullPath:  "cni.chainingMode",
-			pathParts: []string{"cni", "chainingMode"},
-		},
-		{
-			fullPath:  "ipam.operator.clusterPoolIPv4MaskSize",
-			pathParts: []string{"ipam", "operator", "clusterPoolIPv4MaskSize"},
-		},
-		{
-			fullPath:  "ipam.operator.clusterPoolIPv6MaskSize",
-			pathParts: []string{"ipam", "operator", "clusterPoolIPv6MaskSize"},
-		},
-	}
-	allErrs = append(allErrs, validateImmutableValues(newValues, oldValues, fieldPath, []string{
-		"cni",
-		"ipam",
-		"ipv6",
-	}, exclusions)...)
-
-	// Validate that mandatory top-level values are present
-	allErrs = append(allErrs, validateMandatoryValues(newValues, fieldPath, []string{
-		"kubeProxyReplacement", // can be changed if switching KKP proxy mode, but must be present
-	})...)
-
-	// Validate config for strict kubeProxyReplacement (ebpf "proxy mode")
-	if newValues["kubeProxyReplacement"] == "strict" {
-		// Validate mandatory values for kube-proxy-replacement
-		allErrs = append(allErrs, validateMandatoryValues(newValues, fieldPath, []string{
-			"k8sServiceHost",
-			"k8sServicePort",
-		})...)
-	}
-
-	// Validate immutability of operator.securityContext
-	operPath := fieldPath.Child("operator")
-	newOperator, ok := newValues["operator"].(map[string]any)
-	if !ok {
-		allErrs = append(allErrs, field.Invalid(operPath, newValues["operator"], "value missing or incorrect"))
-	}
-	oldOperator, ok := oldValues["operator"].(map[string]any)
-	if !ok {
-		allErrs = append(allErrs, field.Invalid(operPath, oldValues["operator"], "value missing or incorrect"))
-	}
-	allErrs = append(allErrs, validateImmutableValues(newOperator, oldOperator, operPath, []string{
-		"securityContext",
-	}, []exclusion{})...)
-
-	return allErrs
-}
-
-type exclusion struct {
-	fullPath  string
-	pathParts []string
-}
-
-func validateImmutableValues(newValues, oldValues map[string]any, fieldPath *field.Path, immutableValues []string, exclusions []exclusion) field.ErrorList {
-	allErrs := field.ErrorList{}
-	allowedValues := map[string]bool{}
-
-	for _, v := range immutableValues {
-		// Check if the value in `oldValues` is non-empty and missing in `newValues`
-		if _, existsInOld := oldValues[v]; existsInOld {
-			if _, existsInNew := newValues[v]; !existsInNew || newValues[v] == nil || fmt.Sprint(newValues[v]) == "" {
-				allErrs = append(allErrs, field.Invalid(fieldPath.Child(v), newValues[v], "value is immutable"))
-				continue
-			}
-		}
-		for _, exclusion := range exclusions {
-			if strings.HasPrefix(exclusion.fullPath, v) {
-				if excludedKeyExists(newValues, exclusion.pathParts...) {
-					allowedValues[v] = true
-				}
-				if excludedKeyExists(oldValues, exclusion.pathParts...) {
-					allowedValues[v] = true
-				}
-			}
-		}
-		if fmt.Sprint(oldValues[v]) != fmt.Sprint(newValues[v]) && !allowedValues[v] {
-			allErrs = append(allErrs, field.Invalid(fieldPath.Child(v), newValues[v], "value is immutable"))
-		}
-	}
-	return allErrs
-}
-
-func validateMandatoryValues(newValues map[string]any, fieldPath *field.Path, mandatoryValues []string) field.ErrorList {
-	allErrs := field.ErrorList{}
-	for _, v := range mandatoryValues {
-		if _, ok := newValues[v]; !ok {
-			allErrs = append(allErrs, field.NotFound(fieldPath.Child(v), newValues[v]))
-		}
-	}
-	return allErrs
-}
-
-func excludedKeyExists(values map[string]any, keys ...string) bool {
-	if len(keys) == 0 || values == nil {
-		return false
-	}
-	root := keys[0]
-	value, ok := values[root]
-	if !ok {
-		return false
-	}
-
-	if len(keys) == 1 {
-		return true
-	}
-
-	if innerMap, ok := value.(map[string]any); ok {
-		return excludedKeyExists(innerMap, keys[1:]...)
-	}
-
-	return false
-}
-
-func convertDefaultValuesToDefaultValuesBlock(app *appskubermaticv1.ApplicationDefinition) error {
-	if app.Spec.DefaultValues != nil {
-		oldDefVals, err := yaml.JSONToYAML(app.Spec.DefaultValues.Raw)
-		if err != nil {
-			return err
-		}
-		app.Spec.DefaultValuesBlock = string(oldDefVals)
-		app.Spec.DefaultValues = nil
-	}
-	return nil
-}
diff --git a/pkg/cni/cilium/cilium_test.go b/pkg/cni/cilium/cilium_test.go
deleted file mode 100644
index a42e68e4e30..00000000000
--- a/pkg/cni/cilium/cilium_test.go
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
-Copyright 2022 The Kubermatic Kubernetes Platform contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cilium
-
-import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	appskubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/apps.kubermatic/v1"
-	kubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/kubermatic/v1"
-	"k8c.io/kubermatic/v2/pkg/cni"
-	"k8c.io/kubermatic/v2/pkg/resources"
-
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/validation/field"
-	"k8s.io/utils/ptr"
-)
-
-var testCluster = &kubermaticv1.Cluster{
-	Spec: kubermaticv1.ClusterSpec{
-		CNIPlugin: &kubermaticv1.CNIPluginSettings{
-			Type:    kubermaticv1.CNIPluginTypeCilium,
-			Version: cni.GetDefaultCNIPluginVersion(kubermaticv1.CNIPluginTypeCilium),
-		},
-		ClusterNetwork: kubermaticv1.ClusterNetworkingConfig{
-			Pods: kubermaticv1.NetworkRanges{
-				CIDRBlocks: []string{"192.168.0.0/24", "192.168.178.0/24"},
-			},
-			NodeCIDRMaskSizeIPv4: ptr.To[int32](16),
-			ProxyMode:            resources.EBPFProxyMode,
-		},
-		ComponentsOverride: kubermaticv1.ComponentSettings{
-			Apiserver: kubermaticv1.APIServerSettings{
-				NodePortRange: "30000-31777",
-			},
-		},
-	},
-	Status: kubermaticv1.ClusterStatus{
-		Address: kubermaticv1.ClusterAddress{
-			ExternalName: "cluster.kubermatic.test",
-			Port:         6443,
-		},
-	},
-}
-
-func TestGetCiliumAppInstallOverrideValues(t *testing.T) {
-	testCases := []struct {
-		name              string
-		cluster           *kubermaticv1.Cluster
-		overwriteRegistry string
-		expectedValues    string
-	}{
-		{
-			name:              "default values",
-			cluster:           testCluster,
-			overwriteRegistry: "",
-			expectedValues:    `{"certgen":{"podSecurityContext":{"seccompProfile":{"type":"RuntimeDefault"}}},"cni":{"exclusive":false},"envoy":{"podSecurityContext":{"seccompProfile":{"type":"RuntimeDefault"}}},"hubble":{"relay":{"podSecurityContext":{"seccompProfile":{"type":"RuntimeDefault"}}},"ui":{"backend":{},"frontend":{},"securityContext":{"enabled":true,"seccompProfile":{"type":"RuntimeDefault"}}}},"ipam":{"operator":{"clusterPoolIPv4MaskSize":16,"clusterPoolIPv4PodCIDRList":["192.168.0.0/24","192.168.178.0/24"]}},"k8sServiceHost":"cluster.kubermatic.test","k8sServicePort":6443,"kubeProxyReplacement":"true","nodePort":{"range":"30000,31777"},"operator":{"podSecurityContext":{"seccompProfile":{"type":"RuntimeDefault"}},"securityContext":{"seccompProfile":{"type":"RuntimeDefault"}}},"podSecurityContext":{"seccompProfile":{"type":"RuntimeDefault"}}}`,
-		},
-		{
-			name:              "default values with overwrite registry",
-			cluster:           testCluster,
-			overwriteRegistry: "myregistry.io",
-			expectedValues:    `{"certgen":{"image":{"repository":"myregistry.io/cilium/certgen","useDigest":false},"podSecurityContext":{"seccompProfile":{"type":"RuntimeDefault"}}},"cni":{"exclusive":false},"envoy":{"image":{"repository":"myregistry.io/cilium/cilium-envoy","useDigest":false},"podSecurityContext":{"seccompProfile":{"type":"RuntimeDefault"}}},"hubble":{"relay":{"image":{"repository":"myregistry.io/cilium/hubble-relay","useDigest":false},"podSecurityContext":{"seccompProfile":{"type":"RuntimeDefault"}}},"ui":{"backend":{"image":{"repository":"myregistry.io/cilium/hubble-ui-backend","useDigest":false}},"frontend":{"image":{"repository":"myregistry.io/cilium/hubble-ui","useDigest":false}},"securityContext":{"enabled":true,"seccompProfile":{"type":"RuntimeDefault"}}}},"image":{"repository":"myregistry.io/cilium/cilium","useDigest":false},"ipam":{"operator":{"clusterPoolIPv4MaskSize":16,"clusterPoolIPv4PodCIDRList":["192.168.0.0/24","192.168.178.0/24"]}},"k8sServiceHost":"cluster.kubermatic.test","k8sServicePort":6443,"kubeProxyReplacement":"true","nodePort":{"range":"30000,31777"},"operator":{"image":{"repository":"myregistry.io/cilium/operator","useDigest":false},"podSecurityContext":{"seccompProfile":{"type":"RuntimeDefault"}},"securityContext":{"seccompProfile":{"type":"RuntimeDefault"}}},"podSecurityContext":{"seccompProfile":{"type":"RuntimeDefault"}}}`,
-		},
-	}
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			values := GetAppInstallOverrideValues(testCluster, testCase.overwriteRegistry)
-			rawValues, _ := json.Marshal(values)
-			if string(rawValues) != testCase.expectedValues {
-				t.Fatalf("values '%s' do not match expected values '%s'", rawValues, testCase.expectedValues)
-			}
-		})
-	}
-}
-
-func TestValidateCiliumValuesUpdate(t *testing.T) {
-	testCases := []struct {
-		name               string
-		expectedError      string
-		testValuesModifier func(map[string]any)
-	}{
-		{
-			name: "No value change",
-			testValuesModifier: func(values map[string]any) {
-				// NOOP
-			},
-			expectedError: "[]",
-		},
-		{
-			name: "Allowed values change",
-			testValuesModifier: func(values map[string]any) {
-				values["allowed"] = "true"
-			},
-			expectedError: "[]",
-		},
-		{
-			name: "Modified immutable value",
-			testValuesModifier: func(values map[string]any) {
-				values["ipv6"] = map[string]any{"enabled": "true"}
-			},
-			expectedError: "[spec.values.ipv6: Invalid value: map[string]interface {}{\"enabled\":\"true\"}: value is immutable]",
-		},
-		{
-			name: "Removed immutable value",
-			testValuesModifier: func(values map[string]any) {
-				delete(values, "ipam")
-			},
-			expectedError: "[spec.values.ipam: Invalid value: \"null\": value is immutable]",
-		},
-		{
-			name: "Change mandatory value",
-			testValuesModifier: func(values map[string]any) {
-				values["kubeProxyReplacement"] = "false"
-			},
-			expectedError: "[]",
-		},
-		{
-			name: "Remove mandatory value",
-			testValuesModifier: func(values map[string]any) {
-				delete(values, "kubeProxyReplacement")
-			},
-			expectedError: "[spec.values.kubeProxyReplacement: Not found: \"null\"]",
-		},
-		{
-			name: "Remove nested immutable value",
-			testValuesModifier: func(values map[string]any) {
-				o := values["operator"].(map[string]any)
-				delete(o, "securityContext")
-			},
-			expectedError: "[spec.values.operator.securityContext: Invalid value: \"null\": value is immutable]",
-		},
-		{
-			name: "cni excluded field introduced under immutable value",
-			testValuesModifier: func(values map[string]any) {
-				o := values["cni"].(map[string]any)
-				o["chainingMode"] = "test"
-			},
-			expectedError: "[]",
-		},
-		{
-			name: "ipam excluded field introduced under immutable value",
-			testValuesModifier: func(values map[string]any) {
-				ipam := values["ipam"].(map[string]any)
-				op := ipam["operator"].(map[string]any)
-				op["clusterPoolIPv4MaskSize"] = 32
-			},
-			expectedError: "[]",
-		},
-		{
-			name: "Modified multiple immutable nested value in ipam and one is excluded",
-			testValuesModifier: func(values map[string]any) {
-				cni := values["cni"].(map[string]any)
-				cni["chainingMode"] = "test"
-				values["ipv6"] = map[string]any{"enabled": "true"}
-			},
-			expectedError: "[spec.values.ipv6: Invalid value: map[string]interface {}{\"enabled\":\"true\"}: value is immutable]",
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			// get values reconciled by KKP
-			oldValues := GetAppInstallOverrideValues(testCluster, "")
-
-			// copy oldValues to newValues to modify
-			newValues := make(map[string]any)
-			rawValues, _ := json.Marshal(oldValues)
-			err := json.Unmarshal(rawValues, &newValues)
-			if err != nil {
-				t.Fatalf("values unmarshalling failed: %s", err)
-			}
-
-			// modify newValues
-			testCase.testValuesModifier(newValues)
-
-			// validate the update and check for expected errors
-			errList := ValidateValuesUpdate(newValues, oldValues, field.NewPath("spec").Child("values"))
-			if fmt.Sprint(errList) != testCase.expectedError {
-				if testCase.expectedError == "[]" {
-					testCase.expectedError = "nil"
-				}
-				t.Fatalf("expected error to be %s but got %v", testCase.expectedError, errList)
-			}
-		})
-	}
-}
-
-// TestValidateImmutableValues ensures that map comparison works as expected.
-func TestValidateImmutableValues(t *testing.T) {
-	oldValues := GetAppInstallOverrideValues(testCluster, "")
-	// copy oldValues to newValues to modify
-	equalValues := make(map[string]any)
-	rawValues, _ := json.Marshal(oldValues)
-	err := json.Unmarshal(rawValues, &equalValues)
-	if err != nil {
-		t.Fatalf("values unmarshalling failed: %s", err)
-	}
-
-	alteredCluster := testCluster.DeepCopy()
-	alteredCluster.Spec.ClusterNetwork.Pods.CIDRBlocks = []string{"192.123.123.0/24"}
-	alteredValues := GetAppInstallOverrideValues(alteredCluster, "")
-
-	tests := []struct {
-		name            string
-		want            field.ErrorList
-		immutableValues []string
-		acceptedFields  []exclusion
-		fieldPath       *field.Path
-		oldValues       map[string]any
-		newValues       map[string]any
-	}{
-		{
-			name:            "equal spec",
-			immutableValues: []string{"values"},
-			acceptedFields:  []exclusion{},
-			want:            field.ErrorList{},
-			fieldPath:       field.NewPath("spec"),
-			oldValues:       oldValues,
-			newValues:       equalValues,
-		},
-		{
-			name:            "equal values",
-			immutableValues: []string{"cni", "ipam", "ipv6"},
-			acceptedFields:  []exclusion{},
-			want:            field.ErrorList{},
-			fieldPath:       field.NewPath("spec").Child("values"),
-			oldValues:       oldValues,
-			newValues:       equalValues,
-		},
-		{
-			name:            "ipam modified",
-			immutableValues: []string{"cni", "ipam", "ipv6"},
-			acceptedFields:  []exclusion{},
-			want:            field.ErrorList{field.Invalid(field.NewPath("spec").Child("values").Child("ipam"), alteredValues["ipam"], "value is immutable")},
-			fieldPath:       field.NewPath("spec").Child("values"),
-			oldValues:       oldValues,
-			newValues:       alteredValues,
-		},
-		{
-			name:            "ipam modified, but the clusterPoolIPv4MaskSize is accepted",
-			immutableValues: []string{"cni", "ipam", "ipv6"},
-			acceptedFields:  []exclusion{{fullPath: "ipam.operator.clusterPoolIPv4MaskSize", pathParts: strings.Split("ipam.operator.clusterPoolIPv4MaskSize", ".")}},
-			want:            field.ErrorList{},
-			fieldPath:       field.NewPath("spec").Child("values"),
-			oldValues:       oldValues,
-			newValues:       alteredValues,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := validateImmutableValues(tt.newValues, tt.oldValues, tt.fieldPath, tt.immutableValues, tt.acceptedFields); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("%s: validateImmutableValues() = %v, want %v", tt.name, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestConvertValuesToValuesBlock(t *testing.T) {
-	tests := []struct {
-		name   string
-		appIn  *appskubermaticv1.ApplicationDefinition
-		expApp *appskubermaticv1.ApplicationDefinition
-	}{
-		{
-			name: "already using DefaultValuesBlock, nothing to do",
-			appIn: &appskubermaticv1.ApplicationDefinition{
-				Spec: appskubermaticv1.ApplicationDefinitionSpec{
-					DefaultValuesBlock: "key: value",
-				},
-			},
-			expApp: &appskubermaticv1.ApplicationDefinition{
-				Spec: appskubermaticv1.ApplicationDefinitionSpec{
-					DefaultValuesBlock: "key: value",
-				},
-			},
-		},
-		{
-			name: "using DefaultValues, convert to DefaultValuesBlock",
-			appIn: &appskubermaticv1.ApplicationDefinition{
-				Spec: appskubermaticv1.ApplicationDefinitionSpec{
-					DefaultValues: &runtime.RawExtension{Raw: []byte(`{"key": "value"}`)},
-				},
-			},
-			expApp: &appskubermaticv1.ApplicationDefinition{
-				Spec: appskubermaticv1.ApplicationDefinitionSpec{
-					DefaultValuesBlock: "key: value\n",
-				},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := convertDefaultValuesToDefaultValuesBlock(tt.appIn)
-			if err != nil {
-				t.Error(err)
-			}
-
-			assert.Equal(t, tt.appIn, tt.expApp)
-		})
-	}
-}
diff --git a/pkg/controller/operator/master/reconciler.go b/pkg/controller/operator/master/reconciler.go
index 58410795271..a14b2cbf688 100644
--- a/pkg/controller/operator/master/reconciler.go
+++ b/pkg/controller/operator/master/reconciler.go
@@ -24,7 +24,6 @@ import (
 
 	kubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/kubermatic/v1"
 	"k8c.io/kubermatic/v2/pkg/applicationdefinitions"
-	"k8c.io/kubermatic/v2/pkg/cni/cilium"
 	"k8c.io/kubermatic/v2/pkg/controller/operator/common"
 	"k8c.io/kubermatic/v2/pkg/controller/operator/master/resources/kubermatic"
 	"k8c.io/kubermatic/v2/pkg/defaulting"
@@ -488,9 +487,6 @@ func (r *Reconciler) reconcileApplicationDefinitions(ctx context.Context, config
 	if err != nil {
 		return fmt.Errorf("failed to get system application definition reconciler factories: %w", err)
 	}
-
-	sysAppDefReconcilers = append(sysAppDefReconcilers, cilium.ApplicationDefinitionReconciler(config))
-
 	if err := kkpreconciling.ReconcileApplicationDefinitions(ctx, sysAppDefReconcilers, "", r.Client); err != nil {
 		return fmt.Errorf("failed to reconcile ApplicationDefinitions: %w", err)
 	}
diff --git a/pkg/controller/seed-controller-manager/cni-application-installation-controller/controller.go b/pkg/controller/seed-controller-manager/cni-application-installation-controller/controller.go
index 01fcfe54375..b5918e34d60 100644
--- a/pkg/controller/seed-controller-manager/cni-application-installation-controller/controller.go
+++ b/pkg/controller/seed-controller-manager/cni-application-installation-controller/controller.go
@@ -20,7 +20,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"maps"
 	"reflect"
+	"strings"
 	"time"
 
 	"dario.cat/mergo"
@@ -30,9 +32,10 @@ import (
 	kubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/kubermatic/v1"
 	clusterclient "k8c.io/kubermatic/v2/pkg/cluster/client"
 	"k8c.io/kubermatic/v2/pkg/cni"
-	"k8c.io/kubermatic/v2/pkg/cni/cilium"
 	"k8c.io/kubermatic/v2/pkg/controller/util"
+	"k8c.io/kubermatic/v2/pkg/resources"
 	"k8c.io/kubermatic/v2/pkg/resources/reconciling"
+	"k8c.io/kubermatic/v2/pkg/resources/registry"
 	"k8c.io/kubermatic/v2/pkg/util/workerlabel"
 	"k8c.io/kubermatic/v2/pkg/version/kubermatic"
 
@@ -58,6 +61,12 @@ const (
 	cniPluginNamespace = "kube-system"
 )
 
+// Cilium specific constants.
+const (
+	ciliumHelmChartName = "cilium"
+	ciliumImageRegistry = "quay.io/cilium/"
+)
+
 // UserClusterClientProvider provides functionality to get a user cluster client.
 type UserClusterClientProvider interface {
 	GetClient(ctx context.Context, c *kubermaticv1.Cluster, options ...clusterclient.ConfigOption) (ctrlruntimeclient.Client, error)
@@ -379,7 +388,129 @@ func ApplicationInstallationReconciler(cluster *kubermaticv1.Cluster, overwriteR
 
 func getCNIOverrideValues(cluster *kubermaticv1.Cluster, overwriteRegistry string) map[string]any {
 	if cluster.Spec.CNIPlugin.Type == kubermaticv1.CNIPluginTypeCilium {
-		return cilium.GetAppInstallOverrideValues(cluster, overwriteRegistry)
+		return getAppInstallOverrideValues(cluster, overwriteRegistry)
 	}
 	return nil
 }
+
+// getAppInstallOverrideValues returns Helm values to be enforced on the cluster's ApplicationInstallation
+// of the Cilium CNI managed by KKP.
+func getAppInstallOverrideValues(cluster *kubermaticv1.Cluster, overwriteRegistry string) map[string]any {
+	podSecurityContext := map[string]any{
+		"seccompProfile": map[string]any{
+			"type": "RuntimeDefault",
+		},
+	}
+	defaultValues := map[string]any{
+		"podSecurityContext": podSecurityContext,
+	}
+	values := map[string]any{
+		"podSecurityContext": podSecurityContext,
+	}
+	valuesEnvoy := map[string]any{
+		"podSecurityContext": podSecurityContext,
+	}
+
+	valuesOperator := map[string]any{
+		"securityContext": map[string]any{
+			"seccompProfile": map[string]any{
+				"type": "RuntimeDefault",
+			},
+		},
+		"podSecurityContext": podSecurityContext,
+	}
+	valuesCni := map[string]any{
+		// we run Cilium as non-exclusive CNI to allow for Multus use-cases
+		"exclusive": false,
+	}
+
+	valuesCertGen := maps.Clone(defaultValues)
+	valuesRelay := maps.Clone(defaultValues)
+	valuesFrontend := map[string]any{}
+	valuesBackend := map[string]any{}
+
+	if cluster.Spec.ClusterNetwork.ProxyMode == resources.EBPFProxyMode {
+		values["kubeProxyReplacement"] = "true"
+		values["k8sServiceHost"] = cluster.Status.Address.ExternalName
+		values["k8sServicePort"] = cluster.Status.Address.Port
+
+		nodePortRange := cluster.Spec.ComponentsOverride.Apiserver.NodePortRange
+		if nodePortRange != "" && nodePortRange != resources.DefaultNodePortRange {
+			values["nodePort"] = map[string]any{
+				"range": strings.ReplaceAll(nodePortRange, "-", ","),
+			}
+		}
+	} else {
+		values["kubeProxyReplacement"] = "false"
+		values["sessionAffinity"] = true
+		valuesCni["chainingMode"] = "portmap"
+	}
+
+	ipamOperator := map[string]any{
+		"clusterPoolIPv4PodCIDRList": cluster.Spec.ClusterNetwork.Pods.GetIPv4CIDRs(),
+	}
+
+	if cluster.Spec.ClusterNetwork.NodeCIDRMaskSizeIPv4 != nil {
+		ipamOperator["clusterPoolIPv4MaskSize"] = *cluster.Spec.ClusterNetwork.NodeCIDRMaskSizeIPv4
+	}
+
+	if cluster.IsDualStack() {
+		values["ipv6"] = map[string]any{"enabled": true}
+		ipamOperator["clusterPoolIPv6PodCIDRList"] = cluster.Spec.ClusterNetwork.Pods.GetIPv6CIDRs()
+		if cluster.Spec.ClusterNetwork.NodeCIDRMaskSizeIPv6 != nil {
+			ipamOperator["clusterPoolIPv6MaskSize"] = *cluster.Spec.ClusterNetwork.NodeCIDRMaskSizeIPv6
+		}
+	}
+
+	values["ipam"] = map[string]any{"operator": ipamOperator}
+
+	// Override images if registry override is configured
+	if overwriteRegistry != "" {
+		values["image"] = map[string]any{
+			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"cilium", overwriteRegistry)),
+			"useDigest":  false,
+		}
+		valuesOperator["image"] = map[string]any{
+			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"operator", overwriteRegistry)),
+			"useDigest":  false,
+		}
+		valuesRelay["image"] = map[string]any{
+			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"hubble-relay", overwriteRegistry)),
+			"useDigest":  false,
+		}
+		valuesBackend["image"] = map[string]any{
+			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"hubble-ui-backend", overwriteRegistry)),
+			"useDigest":  false,
+		}
+		valuesFrontend["image"] = map[string]any{
+			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"hubble-ui", overwriteRegistry)),
+			"useDigest":  false,
+		}
+		valuesCertGen["image"] = map[string]any{
+			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"certgen", overwriteRegistry)),
+			"useDigest":  false,
+		}
+		valuesEnvoy["image"] = map[string]any{
+			"repository": registry.Must(registry.RewriteImage(ciliumImageRegistry+"cilium-envoy", overwriteRegistry)),
+			"useDigest":  false,
+		}
+	}
+
+	uiSecContext := maps.Clone(podSecurityContext)
+	uiSecContext["enabled"] = true
+
+	values["cni"] = valuesCni
+	values["envoy"] = valuesEnvoy
+	values["operator"] = valuesOperator
+	values["certgen"] = valuesCertGen
+	values["hubble"] = map[string]any{
+		"relay": valuesRelay,
+		"ui": map[string]any{
+			"securityContext": uiSecContext,
+			"frontend":        valuesFrontend,
+			"backend":         valuesBackend,
+		},
+	}
+
+	return values
+}
diff --git a/pkg/controller/seed-controller-manager/cni-application-installation-controller/validation.go b/pkg/controller/seed-controller-manager/cni-application-installation-controller/validation.go
new file mode 100644
index 00000000000..902cae69993
--- /dev/null
+++ b/pkg/controller/seed-controller-manager/cni-application-installation-controller/validation.go
@@ -0,0 +1,144 @@
+/*
+Copyright 2025 The Kubermatic Kubernetes Platform contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cniapplicationinstallationcontroller
+
+import (
+	"fmt"
+	"strings"
+
+	"k8s.io/apimachinery/pkg/util/validation/field"
+)
+
+// ValidateValuesUpdate validates the update operation on provided Cilium Helm values.
+func ValidateValuesUpdate(newValues, oldValues map[string]any, fieldPath *field.Path) field.ErrorList {
+	allErrs := field.ErrorList{}
+	// Validate immutability of specific top-level value subtrees, managed solely by KKP
+	exclusions := []exclusion{
+		{
+			fullPath:  "cni.chainingMode",
+			pathParts: []string{"cni", "chainingMode"},
+		},
+		{
+			fullPath:  "ipam.operator.clusterPoolIPv4MaskSize",
+			pathParts: []string{"ipam", "operator", "clusterPoolIPv4MaskSize"},
+		},
+		{
+			fullPath:  "ipam.operator.clusterPoolIPv6MaskSize",
+			pathParts: []string{"ipam", "operator", "clusterPoolIPv6MaskSize"},
+		},
+	}
+	allErrs = append(allErrs, validateImmutableValues(newValues, oldValues, fieldPath, []string{
+		"cni",
+		"ipam",
+		"ipv6",
+	}, exclusions)...)
+
+	// Validate that mandatory top-level values are present
+	allErrs = append(allErrs, validateMandatoryValues(newValues, fieldPath, []string{
+		"kubeProxyReplacement", // can be changed if switching KKP proxy mode, but must be present
+	})...)
+
+	// Validate config for strict kubeProxyReplacement (ebpf "proxy mode")
+	if newValues["kubeProxyReplacement"] == "strict" {
+		// Validate mandatory values for kube-proxy-replacement
+		allErrs = append(allErrs, validateMandatoryValues(newValues, fieldPath, []string{
+			"k8sServiceHost",
+			"k8sServicePort",
+		})...)
+	}
+
+	// Validate immutability of operator.securityContext
+	operPath := fieldPath.Child("operator")
+	newOperator, ok := newValues["operator"].(map[string]any)
+	if !ok {
+		allErrs = append(allErrs, field.Invalid(operPath, newValues["operator"], "value missing or incorrect"))
+	}
+	oldOperator, ok := oldValues["operator"].(map[string]any)
+	if !ok {
+		allErrs = append(allErrs, field.Invalid(operPath, oldValues["operator"], "value missing or incorrect"))
+	}
+	allErrs = append(allErrs, validateImmutableValues(newOperator, oldOperator, operPath, []string{
+		"securityContext",
+	}, []exclusion{})...)
+
+	return allErrs
+}
+
+type exclusion struct {
+	fullPath  string
+	pathParts []string
+}
+
+func validateImmutableValues(newValues, oldValues map[string]any, fieldPath *field.Path, immutableValues []string, exclusions []exclusion) field.ErrorList {
+	allErrs := field.ErrorList{}
+	allowedValues := map[string]bool{}
+
+	for _, v := range immutableValues {
+		// Check if the value in `oldValues` is non-empty and missing in `newValues`
+		if _, existsInOld := oldValues[v]; existsInOld {
+			if _, existsInNew := newValues[v]; !existsInNew || newValues[v] == nil || fmt.Sprint(newValues[v]) == "" {
+				allErrs = append(allErrs, field.Invalid(fieldPath.Child(v), newValues[v], "value is immutable"))
+				continue
+			}
+		}
+		for _, exclusion := range exclusions {
+			if strings.HasPrefix(exclusion.fullPath, v) {
+				if excludedKeyExists(newValues, exclusion.pathParts...) {
+					allowedValues[v] = true
+				}
+				if excludedKeyExists(oldValues, exclusion.pathParts...) {
+					allowedValues[v] = true
+				}
+			}
+		}
+		if fmt.Sprint(oldValues[v]) != fmt.Sprint(newValues[v]) && !allowedValues[v] {
+			allErrs = append(allErrs, field.Invalid(fieldPath.Child(v), newValues[v], "value is immutable"))
+		}
+	}
+	return allErrs
+}
+
+func validateMandatoryValues(newValues map[string]any, fieldPath *field.Path, mandatoryValues []string) field.ErrorList {
+	allErrs := field.ErrorList{}
+	for _, v := range mandatoryValues {
+		if _, ok := newValues[v]; !ok {
+			allErrs = append(allErrs, field.NotFound(fieldPath.Child(v), newValues[v]))
+		}
+	}
+	return allErrs
+}
+
+func excludedKeyExists(values map[string]any, keys ...string) bool {
+	if len(keys) == 0 || values == nil {
+		return false
+	}
+	root := keys[0]
+	value, ok := values[root]
+	if !ok {
+		return false
+	}
+
+	if len(keys) == 1 {
+		return true
+	}
+
+	if innerMap, ok := value.(map[string]any); ok {
+		return excludedKeyExists(innerMap, keys[1:]...)
+	}
+
+	return false
+}
diff --git a/pkg/controller/user-cluster-controller-manager/application-installation-controller/controller.go b/pkg/controller/user-cluster-controller-manager/application-installation-controller/controller.go
index 5f95d64c439..ee31f963d8a 100644
--- a/pkg/controller/user-cluster-controller-manager/application-installation-controller/controller.go
+++ b/pkg/controller/user-cluster-controller-manager/application-installation-controller/controller.go
@@ -27,6 +27,7 @@ import (
 	appskubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/apps.kubermatic/v1"
 	"k8c.io/kubermatic/sdk/v2/apis/equality"
 	"k8c.io/kubermatic/v2/pkg/applications"
+	applicationtemplates "k8c.io/kubermatic/v2/pkg/applications/providers/template"
 	userclustercontrollermanager "k8c.io/kubermatic/v2/pkg/controller/user-cluster-controller-manager"
 	"k8c.io/kubermatic/v2/pkg/controller/util"
 	kuberneteshelper "k8c.io/kubermatic/v2/pkg/kubernetes"
@@ -382,3 +383,7 @@ func enqueueAppInstallationForAppDef(userClient ctrlruntimeclient.Client) func(c
 		return res
 	}
 }
+
+func handleAddonCleanup(ctx context.Context, applicationName string, seedClusterNamespace string, seedClient ctrlruntimeclient.Client, log *zap.SugaredLogger) error {
+	return applicationtemplates.HandleAddonCleanup(ctx, applicationName, seedClusterNamespace, seedClient, log)
+}
diff --git a/pkg/controller/user-cluster-controller-manager/application-installation-controller/wrappers_ce.go b/pkg/controller/user-cluster-controller-manager/application-installation-controller/wrappers_ce.go
deleted file mode 100644
index 0353a344933..00000000000
--- a/pkg/controller/user-cluster-controller-manager/application-installation-controller/wrappers_ce.go
+++ /dev/null
@@ -1,31 +0,0 @@
-//go:build !ee
-
-/*
-Copyright 2025 The Kubermatic Kubernetes Platform contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package applicationinstallationcontroller
-
-import (
-	"context"
-
-	"go.uber.org/zap"
-
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-func handleAddonCleanup(ctx context.Context, applicationName string, seedClusterNamespace string, seedClient ctrlruntimeclient.Client, log *zap.SugaredLogger) error {
-	return nil
-}
diff --git a/pkg/controller/user-cluster-controller-manager/application-installation-controller/wrappers_ee.go b/pkg/controller/user-cluster-controller-manager/application-installation-controller/wrappers_ee.go
deleted file mode 100644
index 9b4f7baa461..00000000000
--- a/pkg/controller/user-cluster-controller-manager/application-installation-controller/wrappers_ee.go
+++ /dev/null
@@ -1,33 +0,0 @@
-//go:build ee
-
-/*
-Copyright 2025 The Kubermatic Kubernetes Platform contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package applicationinstallationcontroller
-
-import (
-	"context"
-
-	"go.uber.org/zap"
-
-	eeutil "k8c.io/kubermatic/v2/pkg/ee/applications"
-
-	ctrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-func handleAddonCleanup(ctx context.Context, applicationName string, seedClusterNamespace string, seedClient ctrlruntimeclient.Client, log *zap.SugaredLogger) error {
-	return eeutil.HandleAddonCleanup(ctx, applicationName, seedClusterNamespace, seedClient, log)
-}
diff --git a/pkg/defaulting/configuration.go b/pkg/defaulting/configuration.go
index c5bde025ec2..55fcf26e210 100755
--- a/pkg/defaulting/configuration.go
+++ b/pkg/defaulting/configuration.go
@@ -30,7 +30,6 @@ import (
 	"k8c.io/kubermatic/sdk/v2/semver"
 	"k8c.io/kubermatic/v2/pkg/features"
 	"k8c.io/kubermatic/v2/pkg/resources"
-	"k8c.io/kubermatic/v2/pkg/resources/registry"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -682,22 +681,6 @@ func defaultExternalClusterVersioning(settings *kubermaticv1.KubermaticVersionin
 	return nil
 }
 
-// SystemApplicationsHelmRepositoryFromConfig returns the default Helm repository for the given
-// system applications configuration.
-// if the configuration contains a HelmRepository, it will be used as the helm repository.
-// otherwise the default system applications helm repository will be used.
-func SystemApplicationsHelmRepositoryFromConfig(conf *kubermaticv1.SystemApplicationsConfiguration) string {
-	if conf == nil {
-		return registry.ToOCIURL(DefaultSystemApplicationsHelmRepository)
-	}
-
-	if conf.HelmRepository != "" {
-		return registry.ToOCIURL(conf.HelmRepository)
-	}
-
-	return registry.ToOCIURL(DefaultSystemApplicationsHelmRepository)
-}
-
 const DefaultBackupStoreContainer = `
 name: store-container
 image: d3fk/s3cmd@sha256:fb4c4dcf3b842c3d0ead58bda26d05d045b77546e11ac2143d90abca02cbe823
diff --git a/pkg/install/images/application_definitions.go b/pkg/install/images/application_definitions.go
index 9e017048978..ba277e3eb6c 100644
--- a/pkg/install/images/application_definitions.go
+++ b/pkg/install/images/application_definitions.go
@@ -28,11 +28,13 @@ import (
 
 	appskubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/apps.kubermatic/v1"
 	kubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/kubermatic/v1"
+	"k8c.io/kubermatic/sdk/v2/semver"
+	"k8c.io/kubermatic/v2/pkg/applicationdefinitions"
 	"k8c.io/kubermatic/v2/pkg/applications/providers"
-	"k8c.io/kubermatic/v2/pkg/cni/cilium"
+	"k8c.io/kubermatic/v2/pkg/applications/providers/template"
+	"k8c.io/kubermatic/v2/pkg/defaulting"
 	"k8c.io/kubermatic/v2/pkg/install/helm"
-	"k8c.io/kubermatic/v2/pkg/log"
-	"k8c.io/kubermatic/v2/pkg/resources/reconciling"
+	kubermaticlog "k8c.io/kubermatic/v2/pkg/log"
 
 	"sigs.k8s.io/yaml"
 )
@@ -70,12 +72,24 @@ func SystemAppsHelmCharts(
 	helmTimeout time.Duration,
 	registryPrefix string,
 ) iter.Seq2[*SystemAppsHelmChart, error] {
-	appDefReconcilers := []reconciling.NamedApplicationDefinitionReconcilerFactory{
-		cilium.ApplicationDefinitionReconciler(config),
+	// If system applications are disabled we don't need to do anything.
+	if config.Spec.SystemApplications.Disable {
+		logger.Debug("System applications are disabled, skipping deployment of system application definitions.")
+		return nil
 	}
 
+	log := kubermaticlog.NewDefault().Sugar()
+	sysAppDefReconcilers, err := applicationdefinitions.SystemApplicationDefinitionReconcilerFactories(log, config)
+	if err != nil {
+		return func(yield func(*SystemAppsHelmChart, error) bool) {
+			yield(nil, fmt.Errorf("failed to get system application definition reconciler factories: %w", err))
+		}
+	}
+
+	defaultKubernetesVersion := defaulting.DefaultKubernetesVersioning.Default
+
 	return func(yield func(*SystemAppsHelmChart, error) bool) {
-		for _, createFunc := range appDefReconcilers {
+		for _, createFunc := range sysAppDefReconcilers {
 			appName, creator := createFunc()
 			appDef, err := creator(&appskubermaticv1.ApplicationDefinition{})
 			if err != nil {
@@ -112,6 +126,13 @@ func SystemAppsHelmCharts(
 				return
 			}
 
+			// Render the ApplicationDefinition values to inject template variables
+			values, err = renderApplicationDefinitionValues(values, defaultKubernetesVersion)
+			if err != nil {
+				yield(nil, fmt.Errorf("failed to render ApplicationDefinition values: %w", err))
+				return
+			}
+
 			if appName == kubermaticv1.CNIPluginTypeCilium.String() {
 				// For Cilium, we'll use the default values from the Helm chart but will mutate the values to ensure that additional images are also mirrored.
 				defaultValues, err := appDef.Spec.GetParsedDefaultValues()
@@ -181,7 +202,7 @@ func downloadAppSourceChart(appSource *appskubermaticv1.ApplicationSource, direc
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	sp, err := providers.NewSourceProvider(ctx, log.NewDefault().Sugar(), nil, "", directory, appSource, "")
+	sp, err := providers.NewSourceProvider(ctx, kubermaticlog.NewDefault().Sugar(), nil, "", directory, appSource, "")
 	if err != nil {
 		return "", fmt.Errorf("failed to create app source provider: %w", err)
 	}
@@ -193,3 +214,32 @@ func downloadAppSourceChart(appSource *appskubermaticv1.ApplicationSource, direc
 
 	return chartPath, nil
 }
+
+func renderApplicationDefinitionValues(values []byte, clusterVersion *semver.Semver) ([]byte, error) {
+	// Convert []byte to map[string]interface{}
+	var valuesMap map[string]interface{}
+	if values != nil {
+		if err := yaml.Unmarshal(values, &valuesMap); err != nil {
+			return nil, fmt.Errorf("failed to unmarshal values: %w", err)
+		}
+	}
+
+	clusterAutoscalerVersion, err := template.GetAutoscalerImageTag(fmt.Sprintf("%d.%d", clusterVersion.Semver().Major(), clusterVersion.Semver().Minor()))
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse autoscaler version with error: %w", err)
+	}
+
+	templateData := template.TemplateData{
+		Cluster: template.ClusterData{
+			Version:           fmt.Sprintf("%d.%d.%d", clusterVersion.Semver().Major(), clusterVersion.Semver().Minor(), clusterVersion.Semver().Patch()),
+			MajorMinorVersion: fmt.Sprintf("%d.%d", clusterVersion.Semver().Major(), clusterVersion.Semver().Minor()),
+			AutoscalerVersion: clusterAutoscalerVersion,
+		},
+	}
+	renderedValues, err := template.RenderValueTemplate(valuesMap, &templateData)
+	if err != nil {
+		return nil, fmt.Errorf("failed to render ApplicationDefinition values: %w", err)
+	}
+
+	return yaml.Marshal(renderedValues)
+}
diff --git a/pkg/test/e2e/appdefinitions/application_definitions_test.go b/pkg/test/e2e/appdefinitions/application_definitions_test.go
index db5d78bc879..f73395d527d 100644
--- a/pkg/test/e2e/appdefinitions/application_definitions_test.go
+++ b/pkg/test/e2e/appdefinitions/application_definitions_test.go
@@ -45,7 +45,7 @@ var (
 
 const (
 	projectName                    = "app-definitions-test-project"
-	countOfInstalledAppDefinitions = 4
+	countOfInstalledAppDefinitions = 5
 )
 
 func init() {
@@ -88,6 +88,6 @@ func TestClusters(t *testing.T) {
 	}
 
 	if len(appDefsList.Items) != countOfInstalledAppDefinitions {
-		t.Fatalf("the number of the applications definitions in the seed cluster is not correct: %v", err)
+		t.Fatalf("the number of the applications definitions in the seed cluster is not correct. Expected: %d, Got: %d", countOfInstalledAppDefinitions, len(appDefsList.Items))
 	}
 }
diff --git a/pkg/validation/application_installation.go b/pkg/validation/application_installation.go
index 612ec3eee9e..ae26bf4d1aa 100644
--- a/pkg/validation/application_installation.go
+++ b/pkg/validation/application_installation.go
@@ -22,7 +22,7 @@ import (
 
 	appskubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/apps.kubermatic/v1"
 	kubermaticv1 "k8c.io/kubermatic/sdk/v2/apis/kubermatic/v1"
-	"k8c.io/kubermatic/v2/pkg/cni/cilium"
+	cniapplicationinstallationcontroller "k8c.io/kubermatic/v2/pkg/controller/seed-controller-manager/cni-application-installation-controller"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
@@ -170,7 +170,7 @@ func ValidateKKPManagedApplicationInstallationUpdate(newAI, oldAI appskubermatic
 
 		if newAI.Name == kubermaticv1.CNIPluginTypeCilium.String() {
 			// Validate Cilium values update
-			allErrs = append(allErrs, cilium.ValidateValuesUpdate(newValues, oldValues, valuesPath)...)
+			allErrs = append(allErrs, cniapplicationinstallationcontroller.ValidateValuesUpdate(newValues, oldValues, valuesPath)...)
 		}
 	}
 


Reviews:
user: login: ahmedwaleedmalik
state: COMMENTED
author_association: MEMBER
submitted_at: 2025-05-21T11:08:04Z
user: login: ahmedwaleedmalik
state: COMMENTED
author_association: MEMBER
submitted_at: 2025-05-21T11:49:05Z
user: login: kron4eg
body: /approve
state: APPROVED
author_association: MEMBER
submitted_at: 2025-05-21T14:39:59Z
user: login: buraksekili
body: /approve
state: APPROVED
author_association: CONTRIBUTOR
submitted_at: 2025-05-21T14:44:50Z

Review comments:
diff_hunk: @@ -150,8 +149,6 @@ func updateApplicationDefinition(appDef *appskubermaticv1.ApplicationDefinition,
 	for i := range appDef.Spec.Versions {
 		if sysAppConfig.HelmRepository != "" {
 			appDef.Spec.Versions[i].Template.Source.Helm.URL = registry.ToOCIURL(sysAppConfig.HelmRepository)
-		} else {
-			appDef.Spec.Versions[i].Template.Source.Helm.URL = defaulting.SystemApplicationsHelmRepositoryFromConfig(&sysAppConfig)
path: pkg/applicationdefinitions/application_catalog.go
user: login: ahmedwaleedmalik
body: Note for reviewer:

We are now using YAMLs to store these ApplicationDefinitions and use explicit URLs there. So there is no need for this defaulting through code.
created_at: 2025-05-21T11:08:03Z
author_association: MEMBER
path: pkg/applications/providers/template/wrappers_ee.go
user: login: ahmedwaleedmalik
body: Note for reviewer:
This was never meant to be an EE only feature and the implementation is completely wrong. I've refactored the code to make sure that this works for both CE and EE.

For details: https://github.com/kubermatic/kubermatic/issues/13913#issuecomment-2897641742
created_at: 2025-05-21T11:49:05Z
author_association: MEMBER

PR comments:
user: login: ahmedwaleedmalik
created_at: 2025-05-21T11:05:35Z
body: /assign
/cc @kron4eg @buraksekili 
author_association: MEMBER
user: login: ahmedwaleedmalik
created_at: 2025-05-21T11:49:28Z
body: /milestone KKP 2.28
author_association: MEMBER
user: login: ahmedwaleedmalik
created_at: 2025-05-21T13:53:21Z
body: /approve

(for sig-app-management review)
author_association: MEMBER
user: login: ahmedwaleedmalik
created_at: 2025-05-21T14:29:57Z
body: /cc @cnvergence 
author_association: MEMBER
user: login: kubermatic-bot
created_at: 2025-05-21T14:40:04Z
body: LGTM label has been added.  <details>Git tree hash: 55923153c09475cb8d5fe46aba0bd6225bde09a0</details>
author_association: CONTRIBUTOR
user: login: kubermatic-bot
created_at: 2025-05-21T14:44:58Z
body: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/kubermatic/kubermatic/pull/14584#issuecomment-2898056357" title="Approved">ahmedwaleedmalik</a>*, *<a href="https://github.com/kubermatic/kubermatic/pull/14584#pullrequestreview-2858025981" title="Approved">buraksekili</a>*, *<a href="https://github.com/kubermatic/kubermatic/pull/14584#pullrequestreview-2858008810" title="Approved">kron4eg</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=kubermatic%2Fkubermatic).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/kubermatic/kubermatic/blob/main/OWNERS)~~ [ahmedwaleedmalik,buraksekili,kron4eg]
- ~~[cmd/kubermatic-installer/OWNERS](https://github.com/kubermatic/kubermatic/blob/main/cmd/kubermatic-installer/OWNERS)~~ [ahmedwaleedmalik,kron4eg]
- ~~[pkg/applications/OWNERS](https://github.com/kubermatic/kubermatic/blob/main/pkg/applications/OWNERS)~~ [ahmedwaleedmalik]
- ~~[pkg/cni/OWNERS](https://github.com/kubermatic/kubermatic/blob/main/pkg/cni/OWNERS)~~ [buraksekili]
- ~~[pkg/controller/OWNERS](https://github.com/kubermatic/kubermatic/blob/main/pkg/controller/OWNERS)~~ [ahmedwaleedmalik,kron4eg]
- ~~[pkg/controller/seed-controller-manager/cni-application-installation-controller/OWNERS](https://github.com/kubermatic/kubermatic/blob/main/pkg/controller/seed-controller-manager/cni-application-installation-controller/OWNERS)~~ [buraksekili]
- ~~[pkg/controller/user-cluster-controller-manager/application-installation-controller/OWNERS](https://github.com/kubermatic/kubermatic/blob/main/pkg/controller/user-cluster-controller-manager/application-installation-controller/OWNERS)~~ [ahmedwaleedmalik]
- ~~[pkg/install/OWNERS](https://github.com/kubermatic/kubermatic/blob/main/pkg/install/OWNERS)~~ [ahmedwaleedmalik,kron4eg]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
author_association: CONTRIBUTOR