diff --git a/charts/consumer-app-cleanup-job/Chart.lock b/charts/consumer-app-cleanup-job/Chart.lock
index 614b69fc0..8aa27f87e 100644
--- a/charts/consumer-app-cleanup-job/Chart.lock
+++ b/charts/consumer-app-cleanup-job/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
-- name: common-app
-  repository: file://../common-app
+- name: kafka-app
+  repository: file://../kafka-app
   version: 0.1.0
-digest: sha256:bfb2c4a354de9dcac6f2a441aa8462633200eb9eeec2fdbca120b8e3597d62d2
-generated: "2025-11-07T16:23:29.649069+01:00"
+digest: sha256:5e8276c2722e7e1d58528df277ea76528c31231169ff79a4cb8f59a0e21baed9
+generated: "2025-12-01T17:44:37.85691+01:00"
diff --git a/charts/consumer-app-cleanup-job/Chart.yaml b/charts/consumer-app-cleanup-job/Chart.yaml
index a8034ce00..c9d0441da 100644
--- a/charts/consumer-app-cleanup-job/Chart.yaml
+++ b/charts/consumer-app-cleanup-job/Chart.yaml
@@ -7,6 +7,6 @@ maintainers:
     email: opensource@bakdata.com
     url: bakdata.com
 dependencies:
-  - name: common-app
+  - name: kafka-app
     version: "0.1.0"
-    repository: "file://../common-app"
+    repository: "file://../kafka-app"
diff --git a/charts/consumer-app-cleanup-job/templates/configmap.yaml b/charts/consumer-app-cleanup-job/templates/configmap.yaml
index efbeffd77..82b6ff825 100644
--- a/charts/consumer-app-cleanup-job/templates/configmap.yaml
+++ b/charts/consumer-app-cleanup-job/templates/configmap.yaml
@@ -1 +1 @@
-{{- include "common-app.configmap" . -}}
+{{- include "kafka-app.configmap" . -}}
diff --git a/charts/consumer-app-cleanup-job/templates/job.yaml b/charts/consumer-app-cleanup-job/templates/job.yaml
index 4b5f8e303..34c13f13d 100644
--- a/charts/consumer-app-cleanup-job/templates/job.yaml
+++ b/charts/consumer-app-cleanup-job/templates/job.yaml
@@ -2,10 +2,10 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
     {{- end }}
@@ -20,7 +20,7 @@ spec:
       {{- end }}
     {{- end }}
       labels:
-        {{- include "common-app.selectorLabels" . | nindent 8 }}
+        {{- include "kafka-app.selectorLabels" . | nindent 8 }}
         {{- range $key, $value := .Values.podLabels }}
         {{ $key }}: {{ $value }}
         {{- end }}
@@ -93,7 +93,7 @@ spec:
             - name: "{{ $key }}"
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "common-app.fullname" . }}
+                  name: {{ include "kafka-app.fullname" . }}
                   key: "{{ $key }}"
             {{- end }}
             {{- range $key, $value := .Values.secretRefs }}
@@ -137,7 +137,7 @@ spec:
         {{- if .Values.files }}
         - name: config
           configMap:
-            name: {{ include "common-app.fullname" . }}
+            name: {{ include "kafka-app.fullname" . }}
         {{- end }}
         {{- range .Values.secretFilesRefs }}
         - name: {{ .volume }}
diff --git a/charts/consumer-app-cleanup-job/templates/secrets.yaml b/charts/consumer-app-cleanup-job/templates/secrets.yaml
index 8840d9354..57b5ed8c4 100644
--- a/charts/consumer-app-cleanup-job/templates/secrets.yaml
+++ b/charts/consumer-app-cleanup-job/templates/secrets.yaml
@@ -1 +1 @@
-{{- include "common-app.secrets" . -}}
+{{- include "kafka-app.secrets" . -}}
diff --git a/charts/consumer-app/Chart.lock b/charts/consumer-app/Chart.lock
index 1dd7b474a..4362212ff 100644
--- a/charts/consumer-app/Chart.lock
+++ b/charts/consumer-app/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
-- name: common-app
-  repository: file://../common-app
+- name: kafka-app
+  repository: file://../kafka-app
   version: 0.1.0
-digest: sha256:bfb2c4a354de9dcac6f2a441aa8462633200eb9eeec2fdbca120b8e3597d62d2
-generated: "2025-11-07T16:23:28.620151+01:00"
+digest: sha256:5e8276c2722e7e1d58528df277ea76528c31231169ff79a4cb8f59a0e21baed9
+generated: "2025-12-01T17:44:35.384133+01:00"
diff --git a/charts/consumer-app/Chart.yaml b/charts/consumer-app/Chart.yaml
index 72275442b..0a06a84d3 100644
--- a/charts/consumer-app/Chart.yaml
+++ b/charts/consumer-app/Chart.yaml
@@ -7,6 +7,6 @@ maintainers:
     email: opensource@bakdata.com
     url: bakdata.com
 dependencies:
-  - name: common-app
+  - name: kafka-app
     version: "0.1.0"
-    repository: "file://../common-app"
+    repository: "file://../kafka-app"
diff --git a/charts/consumer-app/templates/configmap.yaml b/charts/consumer-app/templates/configmap.yaml
index efbeffd77..82b6ff825 100644
--- a/charts/consumer-app/templates/configmap.yaml
+++ b/charts/consumer-app/templates/configmap.yaml
@@ -1 +1 @@
-{{- include "common-app.configmap" . -}}
+{{- include "kafka-app.configmap" . -}}
diff --git a/charts/consumer-app/templates/deployment.yaml b/charts/consumer-app/templates/deployment.yaml
index 385f927bc..02dc39772 100644
--- a/charts/consumer-app/templates/deployment.yaml
+++ b/charts/consumer-app/templates/deployment.yaml
@@ -14,17 +14,17 @@ kind: StatefulSet
 kind: Deployment
 {{- end }}
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.deployment-annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.deployment-annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     streams-bootstrap/kind: {{ .Chart.Name }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
     {{- end }}
 spec:
   {{- if .Values.statefulSet }}
-  serviceName: {{ include "common-app.fullname" . }}
+  serviceName: {{ include "kafka-app.fullname" . }}
   podManagementPolicy: Parallel
   {{- end }}
   {{- if (not .Values.autoscaling.enabled) }}
@@ -32,7 +32,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "common-app.selectorLabels" . | nindent 6 }}
+      {{- include "kafka-app.selectorLabels" . | nindent 6 }}
   template:
     metadata:
     {{- if or .Values.podAnnotations .Values.files }}
@@ -45,7 +45,7 @@ spec:
       {{- end }}
     {{- end }}
       labels:
-        {{- include "common-app.selectorLabels" . | nindent 8 }}
+        {{- include "kafka-app.selectorLabels" . | nindent 8 }}
         streams-bootstrap/kind: {{ .Chart.Name }}
         {{- range $key, $value := .Values.podLabels }}
         {{ $key }}: {{ $value }}
@@ -126,7 +126,7 @@ spec:
             - name: "{{ $key }}"
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "common-app.fullname" . }}
+                  name: {{ include "kafka-app.fullname" . }}
                   key: "{{ $key }}"
           {{- end }}
           {{- range $key, $value := .Values.secretRefs }}
@@ -222,12 +222,12 @@ spec:
         {{- if .Values.prometheus.jmx.enabled }}
         - name: jmx-config
           configMap:
-            name: {{ include "common-app.fullname" . }}-jmx
+            name: {{ include "kafka-app.fullname" . }}-jmx
         {{- end }}
         {{- if .Values.files }}
         - name: config
           configMap:
-            name: {{ include "common-app.fullname" . }}
+            name: {{ include "kafka-app.fullname" . }}
         {{- end }}
         {{- range .Values.secretFilesRefs }}
         - name: {{ .volume }}
diff --git a/charts/consumer-app/templates/jmx-configmap.yaml b/charts/consumer-app/templates/jmx-configmap.yaml
index cbc49b3fe..c5f3719ab 100644
--- a/charts/consumer-app/templates/jmx-configmap.yaml
+++ b/charts/consumer-app/templates/jmx-configmap.yaml
@@ -1 +1 @@
-{{- include "common-app.jmx-configmap" . -}}
+{{- include "kafka-app.jmx-configmap" . -}}
diff --git a/charts/consumer-app/templates/scaled-object.yaml b/charts/consumer-app/templates/scaled-object.yaml
index b6797d449..77c6bd642 100644
--- a/charts/consumer-app/templates/scaled-object.yaml
+++ b/charts/consumer-app/templates/scaled-object.yaml
@@ -1 +1 @@
-{{- include "common-app.scaled-object" . -}}
+{{- include "kafka-app.scaled-object" . -}}
diff --git a/charts/consumer-app/templates/secrets.yaml b/charts/consumer-app/templates/secrets.yaml
index 8840d9354..57b5ed8c4 100644
--- a/charts/consumer-app/templates/secrets.yaml
+++ b/charts/consumer-app/templates/secrets.yaml
@@ -1 +1 @@
-{{- include "common-app.secrets" . -}}
+{{- include "kafka-app.secrets" . -}}
diff --git a/charts/consumer-app/templates/service.yaml b/charts/consumer-app/templates/service.yaml
index 8968b3874..fcf2f190a 100644
--- a/charts/consumer-app/templates/service.yaml
+++ b/charts/consumer-app/templates/service.yaml
@@ -1 +1 @@
-{{- include "common-app.service" . -}}
+{{- include "kafka-app.service" . -}}
diff --git a/charts/common-app/Chart.yaml b/charts/kafka-app/Chart.yaml
similarity index 92%
rename from charts/common-app/Chart.yaml
rename to charts/kafka-app/Chart.yaml
index 4c4d46144..22bb53669 100644
--- a/charts/common-app/Chart.yaml
+++ b/charts/kafka-app/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: common-app
+name: kafka-app
 description: A common library chart for Kafka applications.
 type: library
 version: 0.1.0
diff --git a/charts/common-app/README.md b/charts/kafka-app/README.md
similarity index 97%
rename from charts/common-app/README.md
rename to charts/kafka-app/README.md
index a62a7fd5c..24cc5ed2e 100644
--- a/charts/common-app/README.md
+++ b/charts/kafka-app/README.md
@@ -1,4 +1,4 @@
-# common-app library helm chart
+# kafka-app library helm chart
 
 This is a **library chart** used to provide common, reusable templates for Kafka applications.
 
@@ -14,9 +14,9 @@ type: application
 version: 0.1.0
 
 dependencies:
-  - name: common-app
+  - name: kafka-app
     version: "0.1.0"
-    repository: "file://../common-app" # Or an HTTP repository
+    repository: "file://../kafka-app" # Or an HTTP repository
 ```
 You can then include the library's templates in your own templates/ files. The library templates will be rendered using the values from your application's values.yaml file.
 
@@ -24,57 +24,57 @@ You can then include the library's templates in your own templates/ files. The l
 
 You can include any of the following templates in your application chart.
 
-### `common-app.deployment`
+### `kafka-app.deployment`
 Renders the main `Deployment` for the application.
 * **Enabled by:** `.Values.deployment: true`.
 * **Usage (`templates/deployment.yaml`):**
     ```yaml
-    {{- include "common-app.deployment" . -}}
+    {{- include "kafka-app.deployment" . -}}
     ```
 
 
-### `common-app.service`
+### `kafka-app.service`
 Renders a `Service` to expose the application.
 * **Enabled by:** `.Values.service.enabled: true`.
 * **Usage (`templates/service.yaml`):**
     ```yaml
-    {{- include "common-app.service" . -}}
+    {{- include "kafka-app.service" . -}}
     ```
 
 
-### `common-app.scaled-object`
+### `kafka-app.scaled-object`
 Renders a KEDA `ScaledObject` for autoscaling.
 * **Enabled by:** `.Values.autoscaling.enabled: true`.
 * **Usage (`templates/scaled-object.yaml`):**
     ```yaml
-    {{- include "common-app.scaled-object" . -}}
+    {{- include "kafka-app.scaled-object" . -}}
     ```
 
 
-### `common-app.configmap`
+### `kafka-app.configmap`
 Renders a `ConfigMap` for mounting files specified in `.Values.files`.
 * **Enabled by:** Providing values under the `.Values.files` key.
 * **Usage (`templates/configmap.yaml`):**
     ```yaml
-    {{- include "common-app.configmap" . -}}
+    {{- include "kafka-app.configmap" . -}}
     ```
 
 
-### `common-app.secrets`
+### `kafka-app.secrets`
 Renders a `Secret` for populating environment variables from `.Values.secrets`.
 * **Enabled by:** Providing values under the `.Values.secrets` key.
 * **Usage (`templates/secrets.yaml`):**
     ```yaml
-    {{- include "common-app.secrets" . -}}
+    {{- include "kafka-app.secrets" . -}}
     ```
 
 
-### `common-app.jmx-configmap`
+### `kafka-app.jmx-configmap`
 Renders a `ConfigMap` for the Prometheus JMX exporter sidecar.
 * **Enabled by:** `.Values.prometheus.jmx.enabled: true`.
 * **Usage (`templates/jmx-configmap.yaml`):**
     ```yaml
-    {{- include "common-app.jmx-configmap" . -}}
+    {{- include "kafka-app.jmx-configmap" . -}}
     ```
 
 ## Configurations This Library Uses
diff --git a/charts/common-app/templates/_configmap.yaml b/charts/kafka-app/templates/_configmap.yaml
similarity index 63%
rename from charts/common-app/templates/_configmap.yaml
rename to charts/kafka-app/templates/_configmap.yaml
index cee71a5d7..5a0fb5201 100644
--- a/charts/common-app/templates/_configmap.yaml
+++ b/charts/kafka-app/templates/_configmap.yaml
@@ -1,12 +1,12 @@
-{{- define "common-app.configmap" -}}
+{{- define "kafka-app.configmap" -}}
 {{ if .Values.files }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
     {{- end }}
diff --git a/charts/common-app/templates/_deployment.yaml b/charts/kafka-app/templates/_deployment.yaml
similarity index 93%
rename from charts/common-app/templates/_deployment.yaml
rename to charts/kafka-app/templates/_deployment.yaml
index 8111c6946..62464ecf6 100644
--- a/charts/common-app/templates/_deployment.yaml
+++ b/charts/kafka-app/templates/_deployment.yaml
@@ -1,4 +1,4 @@
-{{- define "common-app.deployment" -}}
+{{- define "kafka-app.deployment" -}}
 {{- $root := . -}}
 {{- if and .Values.persistence.enabled (not .Values.persistence.size) }}
 {{- fail "When persistence is enabled, you must set .Values.persistence.size" }}
@@ -15,17 +15,17 @@ kind: StatefulSet
 kind: Deployment
 {{- end }}
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.deployment-annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.deployment-annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     streams-bootstrap/kind: {{ .Chart.Name }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
     {{- end }}
 spec:
   {{- if .Values.statefulSet }}
-  serviceName: {{ include "common-app.fullname" . }}
+  serviceName: {{ include "kafka-app.fullname" . }}
   podManagementPolicy: Parallel
   {{- end }}
   {{- if (not .Values.autoscaling.enabled) }}
@@ -33,7 +33,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "common-app.selectorLabels" . | nindent 6 }}
+      {{- include "kafka-app.selectorLabels" . | nindent 6 }}
   template:
     metadata:
     {{- if or .Values.podAnnotations .Values.files }}
@@ -46,7 +46,7 @@ spec:
       {{- end }}
     {{- end }}
       labels:
-        {{- include "common-app.selectorLabels" . | nindent 8 }}
+        {{- include "kafka-app.selectorLabels" . | nindent 8 }}
         streams-bootstrap/kind: {{ .Chart.Name }}
         {{- range $key, $value := .Values.podLabels }}
         {{ $key }}: {{ $value }}
@@ -153,7 +153,7 @@ spec:
             - name: "{{ $key }}"
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "common-app.fullname" . }}
+                  name: {{ include "kafka-app.fullname" . }}
                   key: "{{ $key }}"
           {{- end }}
           {{- range $key, $value := .Values.secretRefs }}
@@ -231,7 +231,7 @@ spec:
           imagePullPolicy: "{{ .Values.prometheus.jmx.imagePullPolicy }}"
           args:
             - {{ .Values.prometheus.jmx.port | quote }}
-            - /etc/jmx-{{ include "common-app.name" . }}/jmx-kafka-{{ include "common-app.name" . }}-prometheus.yml
+            - /etc/jmx-{{ include "kafka-app.name" . }}/jmx-kafka-{{ include "kafka-app.name" . }}-prometheus.yml
           env:
             - name: JAVA_TOOL_OPTIONS
               value: "-XX:MaxRAMPercentage=90.0"
@@ -242,19 +242,19 @@ spec:
 {{ toYaml .Values.prometheus.jmx.resources | indent 12 }}
           volumeMounts:
             - name: jmx-config
-              mountPath: /etc/jmx-{{ include "common-app.name" . }}
+              mountPath: /etc/jmx-{{ include "kafka-app.name" . }}
       {{- end }}
       {{- if or (.Values.prometheus.jmx.enabled) (.Values.files) (.Values.secretFilesRefs) }}
       volumes:
         {{- if .Values.prometheus.jmx.enabled }}
         - name: jmx-config
           configMap:
-            name: {{ include "common-app.fullname" . }}-jmx
+            name: {{ include "kafka-app.fullname" . }}-jmx
         {{- end }}
         {{- if .Values.files }}
         - name: config
           configMap:
-            name: {{ include "common-app.fullname" . }}
+            name: {{ include "kafka-app.fullname" . }}
         {{- end }}
         {{- range .Values.secretFilesRefs }}
         - name: {{ .volume }}
diff --git a/charts/common-app/templates/_helpers.tpl b/charts/kafka-app/templates/_helpers.tpl
similarity index 83%
rename from charts/common-app/templates/_helpers.tpl
rename to charts/kafka-app/templates/_helpers.tpl
index b00be4c74..2f6f45c26 100644
--- a/charts/common-app/templates/_helpers.tpl
+++ b/charts/kafka-app/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "common-app.name" -}}
+{{- define "kafka-app.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "common-app.fullname" -}}
+{{- define "kafka-app.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "common-app.chart" -}}
+{{- define "kafka-app.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "common-app.labels" -}}
-helm.sh/chart: {{ include "common-app.chart" . }}
-{{ include "common-app.selectorLabels" . }}
+{{- define "kafka-app.labels" -}}
+helm.sh/chart: {{ include "kafka-app.chart" . }}
+{{ include "kafka-app.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,8 +46,8 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "common-app.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "common-app.name" . }}
+{{- define "kafka-app.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kafka-app.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
@@ -55,7 +55,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Define default annotations from .Values.annotations.
 This will be used across resources.
 */}}
-{{- define "common-app.annotations" -}}
+{{- define "kafka-app.annotations" -}}
 {{- if or .Values.annotations }}
   annotations:
 {{- range $key, $value := .Values.annotations }}
@@ -68,7 +68,7 @@ This will be used across resources.
 Define annotations helper for Deployment.
 Includes default annotations and conditionally adds consumerGroup if applicable.
 */}}
-{{- define "common-app.deployment-annotations" -}}
+{{- define "kafka-app.deployment-annotations" -}}
 {{/* Use applicationId for Kafka Streams, otherwise use groupId for Kafka Consumers */}}
 {{- $uniqueId := coalesce .Values.kafka.applicationId .Values.kafka.groupId }}
 {{- if or .Values.annotations $uniqueId }}
diff --git a/charts/common-app/templates/_jmx-configmap.yaml b/charts/kafka-app/templates/_jmx-configmap.yaml
similarity index 64%
rename from charts/common-app/templates/_jmx-configmap.yaml
rename to charts/kafka-app/templates/_jmx-configmap.yaml
index 2a8897f17..0d7acc848 100644
--- a/charts/common-app/templates/_jmx-configmap.yaml
+++ b/charts/kafka-app/templates/_jmx-configmap.yaml
@@ -1,17 +1,17 @@
-{{- define "common-app.jmx-configmap" -}}
+{{- define "kafka-app.jmx-configmap" -}}
 {{- if and .Values.prometheus.jmx.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common-app.fullname" . }}-jmx
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}-jmx
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
     {{- end }}
 data:
-  jmx-kafka-{{ include "common-app.name" . }}-prometheus.yml: |+
+  jmx-kafka-{{ include "kafka-app.name" . }}-prometheus.yml: |+
     jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:{{ .Values.jmx.port }}/jmxrmi
     lowercaseOutputName: true
     lowercaseOutputLabelNames: true
diff --git a/charts/common-app/templates/_scaled-object.yaml b/charts/kafka-app/templates/_scaled-object.yaml
similarity index 93%
rename from charts/common-app/templates/_scaled-object.yaml
rename to charts/kafka-app/templates/_scaled-object.yaml
index 82b9c2047..8470d01b4 100644
--- a/charts/common-app/templates/_scaled-object.yaml
+++ b/charts/kafka-app/templates/_scaled-object.yaml
@@ -1,4 +1,4 @@
-{{- define "common-app.scaled-object" -}}
+{{- define "kafka-app.scaled-object" -}}
 {{ if .Values.autoscaling.enabled }}
   {{- $uniqueId := coalesce .Values.kafka.applicationId .Values.kafka.groupId -}}
   {{- if not (and $uniqueId .Values.autoscaling.lagThreshold) }}
@@ -8,10 +8,10 @@
 apiVersion: keda.sh/v1alpha1
 kind: ScaledObject
 metadata:
-  name: {{ include "common-app.fullname" . }}-so
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}-so
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
     {{- end }}
@@ -27,7 +27,7 @@ spec:
     {{- else }}
     kind: Deployment
     {{- end }}
-    name: {{ include "common-app.fullname" . }}
+    name: {{ include "kafka-app.fullname" . }}
   pollingInterval: {{ .Values.autoscaling.pollingInterval }}
   cooldownPeriod:  {{ .Values.autoscaling.cooldownPeriod }}
   minReplicaCount: {{ .Values.autoscaling.minReplicas }}
diff --git a/charts/common-app/templates/_secrets.yaml b/charts/kafka-app/templates/_secrets.yaml
similarity index 64%
rename from charts/common-app/templates/_secrets.yaml
rename to charts/kafka-app/templates/_secrets.yaml
index ece8e31db..48940c10b 100644
--- a/charts/common-app/templates/_secrets.yaml
+++ b/charts/kafka-app/templates/_secrets.yaml
@@ -1,12 +1,12 @@
-{{- define "common-app.secrets" -}}
+{{- define "kafka-app.secrets" -}}
 {{- if .Values.secrets }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
     {{- end }}
diff --git a/charts/common-app/templates/_service.yaml b/charts/kafka-app/templates/_service.yaml
similarity index 68%
rename from charts/common-app/templates/_service.yaml
rename to charts/kafka-app/templates/_service.yaml
index 553ee8bad..cefad0b59 100644
--- a/charts/common-app/templates/_service.yaml
+++ b/charts/kafka-app/templates/_service.yaml
@@ -1,18 +1,18 @@
-{{- define "common-app.service" -}}
+{{- define "kafka-app.service" -}}
 {{- if .Values.service.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.service.labels }}
     {{ $key }}: {{ $value }}
     {{- end }}
 spec:
   selector:
-    {{- include "common-app.selectorLabels" . | nindent 4 }}
+    {{- include "kafka-app.selectorLabels" . | nindent 4 }}
   ports:
   {{- range .Values.ports }}
     {{- if .servicePort }}
diff --git a/charts/common-app/values.yaml b/charts/kafka-app/values.yaml
similarity index 100%
rename from charts/common-app/values.yaml
rename to charts/kafka-app/values.yaml
diff --git a/charts/producer-app-cleanup-job/Chart.lock b/charts/producer-app-cleanup-job/Chart.lock
index 3e68470b5..68a22c449 100644
--- a/charts/producer-app-cleanup-job/Chart.lock
+++ b/charts/producer-app-cleanup-job/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
-- name: common-app
-  repository: file://../common-app
+- name: kafka-app
+  repository: file://../kafka-app
   version: 0.1.0
-digest: sha256:bfb2c4a354de9dcac6f2a441aa8462633200eb9eeec2fdbca120b8e3597d62d2
-generated: "2025-11-05T16:45:44.089441+01:00"
+digest: sha256:5e8276c2722e7e1d58528df277ea76528c31231169ff79a4cb8f59a0e21baed9
+generated: "2025-12-01T17:31:50.499054+01:00"
diff --git a/charts/producer-app-cleanup-job/Chart.yaml b/charts/producer-app-cleanup-job/Chart.yaml
index 6c9ba5ce6..0e598abb7 100644
--- a/charts/producer-app-cleanup-job/Chart.yaml
+++ b/charts/producer-app-cleanup-job/Chart.yaml
@@ -7,6 +7,6 @@ maintainers:
     email: opensource@bakdata.com
     url: bakdata.com
 dependencies:
-  - name: common-app
+  - name: kafka-app
     version: "0.1.0"
-    repository: "file://../common-app"
+    repository: "file://../kafka-app"
diff --git a/charts/producer-app-cleanup-job/templates/configmap.yaml b/charts/producer-app-cleanup-job/templates/configmap.yaml
index efbeffd77..82b6ff825 100644
--- a/charts/producer-app-cleanup-job/templates/configmap.yaml
+++ b/charts/producer-app-cleanup-job/templates/configmap.yaml
@@ -1 +1 @@
-{{- include "common-app.configmap" . -}}
+{{- include "kafka-app.configmap" . -}}
diff --git a/charts/producer-app-cleanup-job/templates/job.yaml b/charts/producer-app-cleanup-job/templates/job.yaml
index d9ad528d0..2add067b5 100644
--- a/charts/producer-app-cleanup-job/templates/job.yaml
+++ b/charts/producer-app-cleanup-job/templates/job.yaml
@@ -2,10 +2,10 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
     {{- end }}
@@ -20,7 +20,7 @@ spec:
       {{- end }}
     {{- end }}
       labels:
-        {{- include "common-app.selectorLabels" . | nindent 8 }}
+        {{- include "kafka-app.selectorLabels" . | nindent 8 }}
         {{- range $key, $value := .Values.podLabels }}
         {{ $key }}: {{ $value }}
         {{- end }}
@@ -76,7 +76,7 @@ spec:
             - name: "{{ $key }}"
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "common-app.fullname" . }}
+                  name: {{ include "kafka-app.fullname" . }}
                   key: "{{ $key }}"
             {{- end }}
             {{- range $key, $value := .Values.secretRefs }}
@@ -120,7 +120,7 @@ spec:
         {{- if .Values.files }}
         - name: config
           configMap:
-            name: {{ include "common-app.fullname" . }}
+            name: {{ include "kafka-app.fullname" . }}
         {{- end }}
         {{- range .Values.secretFilesRefs }}
         - name: {{ .volume }}
diff --git a/charts/producer-app-cleanup-job/templates/secrets.yaml b/charts/producer-app-cleanup-job/templates/secrets.yaml
index 8840d9354..57b5ed8c4 100644
--- a/charts/producer-app-cleanup-job/templates/secrets.yaml
+++ b/charts/producer-app-cleanup-job/templates/secrets.yaml
@@ -1 +1 @@
-{{- include "common-app.secrets" . -}}
+{{- include "kafka-app.secrets" . -}}
diff --git a/charts/producer-app/Chart.lock b/charts/producer-app/Chart.lock
index c1f10fd45..755e17a23 100644
--- a/charts/producer-app/Chart.lock
+++ b/charts/producer-app/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
-- name: common-app
-  repository: file://../common-app
+- name: kafka-app
+  repository: file://../kafka-app
   version: 0.1.0
-digest: sha256:bfb2c4a354de9dcac6f2a441aa8462633200eb9eeec2fdbca120b8e3597d62d2
-generated: "2025-11-05T16:45:45.546772+01:00"
+digest: sha256:5e8276c2722e7e1d58528df277ea76528c31231169ff79a4cb8f59a0e21baed9
+generated: "2025-12-01T17:31:50.439883+01:00"
diff --git a/charts/producer-app/Chart.yaml b/charts/producer-app/Chart.yaml
index a0434bcac..279b32fc7 100644
--- a/charts/producer-app/Chart.yaml
+++ b/charts/producer-app/Chart.yaml
@@ -7,6 +7,6 @@ maintainers:
     email: opensource@bakdata.com
     url: bakdata.com
 dependencies:
-  - name: common-app
+  - name: kafka-app
     version: "0.1.0"
-    repository: "file://../common-app"
+    repository: "file://../kafka-app"
diff --git a/charts/producer-app/templates/_pod.yaml b/charts/producer-app/templates/_pod.yaml
index 19a118b60..c8251f9f9 100644
--- a/charts/producer-app/templates/_pod.yaml
+++ b/charts/producer-app/templates/_pod.yaml
@@ -11,7 +11,7 @@ metadata:
   {{- end }}
 {{- end }}
   labels:
-    {{- include "common-app.selectorLabels" . | nindent 4 }}
+    {{- include "kafka-app.selectorLabels" . | nindent 4 }}
     streams-bootstrap/kind: {{ .Chart.Name }}
     {{- range $key, $value := .Values.podLabels }}
     {{ $key }}: {{ $value }}
@@ -68,7 +68,7 @@ spec:
       - name: "{{ $key }}"
         valueFrom:
           secretKeyRef:
-            name: {{ include "common-app.fullname" . }}
+            name: {{ include "kafka-app.fullname" . }}
             key: "{{ $key }}"
         {{- end }}
         {{- range $key, $value := .Values.secretRefs }}
@@ -128,7 +128,7 @@ spec:
     {{- if .Values.files }}
     - name: config
       configMap:
-        name: {{ include "common-app.fullname" . }}
+        name: {{ include "kafka-app.fullname" . }}
     {{- end }}
     {{- range .Values.secretFilesRefs }}
     - name: {{ .volume }}
diff --git a/charts/producer-app/templates/configmap.yaml b/charts/producer-app/templates/configmap.yaml
index 040678bc5..dabc0298a 100644
--- a/charts/producer-app/templates/configmap.yaml
+++ b/charts/producer-app/templates/configmap.yaml
@@ -2,10 +2,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
     {{- end }}
diff --git a/charts/producer-app/templates/deployment.yaml b/charts/producer-app/templates/deployment.yaml
index 4e6e3be10..0cba9b4f0 100644
--- a/charts/producer-app/templates/deployment.yaml
+++ b/charts/producer-app/templates/deployment.yaml
@@ -7,10 +7,10 @@ apiVersion: apps/v1beta1
 {{- end }}
 kind: Deployment
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     streams-bootstrap/kind: {{ .Chart.Name }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
@@ -19,7 +19,7 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      {{- include "common-app.selectorLabels" . | nindent 6 }}
+      {{- include "kafka-app.selectorLabels" . | nindent 6 }}
   template:
 {{ include "producer-app.podTemplate" . | indent 4 }}
 {{- end }}
diff --git a/charts/producer-app/templates/job.yaml b/charts/producer-app/templates/job.yaml
index 28d8941a7..7150f7dca 100644
--- a/charts/producer-app/templates/job.yaml
+++ b/charts/producer-app/templates/job.yaml
@@ -12,10 +12,10 @@ apiVersion: batch/v1
 kind: Job
   {{- end }}
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     streams-bootstrap/kind: {{ .Chart.Name }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
@@ -29,9 +29,9 @@ spec:
   concurrencyPolicy: Replace
   jobTemplate:
     metadata:
-      {{- include "common-app.annotations" . | indent 4 }}
+      {{- include "kafka-app.annotations" . | indent 4 }}
       labels:
-        {{- include "common-app.selectorLabels" . | nindent 8 }}
+        {{- include "kafka-app.selectorLabels" . | nindent 8 }}
         streams-bootstrap/kind: {{ .Chart.Name }}
         {{- range $key, $value := .Values.labels }}
         {{ $key | quote }}: {{ $value | quote }}
diff --git a/charts/producer-app/templates/secrets.yaml b/charts/producer-app/templates/secrets.yaml
index 8840d9354..57b5ed8c4 100644
--- a/charts/producer-app/templates/secrets.yaml
+++ b/charts/producer-app/templates/secrets.yaml
@@ -1 +1 @@
-{{- include "common-app.secrets" . -}}
+{{- include "kafka-app.secrets" . -}}
diff --git a/charts/producer-app/templates/service.yaml b/charts/producer-app/templates/service.yaml
index 8968b3874..fcf2f190a 100644
--- a/charts/producer-app/templates/service.yaml
+++ b/charts/producer-app/templates/service.yaml
@@ -1 +1 @@
-{{- include "common-app.service" . -}}
+{{- include "kafka-app.service" . -}}
diff --git a/charts/streams-app-cleanup-job/Chart.lock b/charts/streams-app-cleanup-job/Chart.lock
index 47abec149..48b04fab3 100644
--- a/charts/streams-app-cleanup-job/Chart.lock
+++ b/charts/streams-app-cleanup-job/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
-- name: common-app
-  repository: file://../common-app
+- name: kafka-app
+  repository: file://../kafka-app
   version: 0.1.0
-digest: sha256:bfb2c4a354de9dcac6f2a441aa8462633200eb9eeec2fdbca120b8e3597d62d2
-generated: "2025-11-05T16:45:45.841182+01:00"
+digest: sha256:5e8276c2722e7e1d58528df277ea76528c31231169ff79a4cb8f59a0e21baed9
+generated: "2025-12-01T17:31:50.470292+01:00"
diff --git a/charts/streams-app-cleanup-job/Chart.yaml b/charts/streams-app-cleanup-job/Chart.yaml
index 7fd83d32c..ca6de17e0 100644
--- a/charts/streams-app-cleanup-job/Chart.yaml
+++ b/charts/streams-app-cleanup-job/Chart.yaml
@@ -7,6 +7,6 @@ maintainers:
     email: opensource@bakdata.com
     url: bakdata.com
 dependencies:
-  - name: common-app
+  - name: kafka-app
     version: "0.1.0"
-    repository: "file://../common-app"
+    repository: "file://../kafka-app"
diff --git a/charts/streams-app-cleanup-job/templates/configmap.yaml b/charts/streams-app-cleanup-job/templates/configmap.yaml
index efbeffd77..82b6ff825 100644
--- a/charts/streams-app-cleanup-job/templates/configmap.yaml
+++ b/charts/streams-app-cleanup-job/templates/configmap.yaml
@@ -1 +1 @@
-{{- include "common-app.configmap" . -}}
+{{- include "kafka-app.configmap" . -}}
diff --git a/charts/streams-app-cleanup-job/templates/job.yaml b/charts/streams-app-cleanup-job/templates/job.yaml
index be98bf6ca..785a2c166 100644
--- a/charts/streams-app-cleanup-job/templates/job.yaml
+++ b/charts/streams-app-cleanup-job/templates/job.yaml
@@ -2,10 +2,10 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "common-app.fullname" . }}
-  {{- include "common-app.annotations" . }}
+  name: {{ include "kafka-app.fullname" . }}
+  {{- include "kafka-app.annotations" . }}
   labels:
-    {{- include "common-app.labels" . | nindent 4 }}
+    {{- include "kafka-app.labels" . | nindent 4 }}
     {{- range $key, $value := .Values.labels }}
     {{ $key | quote }}: {{ $value | quote }}
     {{- end }}
@@ -20,7 +20,7 @@ spec:
       {{- end }}
     {{- end }}
       labels:
-        {{- include "common-app.selectorLabels" . | nindent 8 }}
+        {{- include "kafka-app.selectorLabels" . | nindent 8 }}
         {{- range $key, $value := .Values.podLabels }}
         {{ $key }}: {{ $value }}
         {{- end }}
@@ -105,7 +105,7 @@ spec:
             - name: "{{ $key }}"
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "common-app.fullname" . }}
+                  name: {{ include "kafka-app.fullname" . }}
                   key: "{{ $key }}"
             {{- end }}
             {{- range $key, $value := .Values.secretRefs }}
@@ -149,7 +149,7 @@ spec:
         {{- if .Values.files }}
         - name: config
           configMap:
-            name: {{ include "common-app.fullname" . }}
+            name: {{ include "kafka-app.fullname" . }}
         {{- end }}
         {{- range .Values.secretFilesRefs }}
         - name: {{ .volume }}
diff --git a/charts/streams-app-cleanup-job/templates/secrets.yaml b/charts/streams-app-cleanup-job/templates/secrets.yaml
index 8840d9354..57b5ed8c4 100644
--- a/charts/streams-app-cleanup-job/templates/secrets.yaml
+++ b/charts/streams-app-cleanup-job/templates/secrets.yaml
@@ -1 +1 @@
-{{- include "common-app.secrets" . -}}
+{{- include "kafka-app.secrets" . -}}
diff --git a/charts/streams-app/Chart.lock b/charts/streams-app/Chart.lock
index 64dcd08e9..1892d4c3a 100644
--- a/charts/streams-app/Chart.lock
+++ b/charts/streams-app/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
-- name: common-app
-  repository: file://../common-app
+- name: kafka-app
+  repository: file://../kafka-app
   version: 0.1.0
-digest: sha256:bfb2c4a354de9dcac6f2a441aa8462633200eb9eeec2fdbca120b8e3597d62d2
-generated: "2025-11-05T15:08:45.96812+01:00"
+digest: sha256:5e8276c2722e7e1d58528df277ea76528c31231169ff79a4cb8f59a0e21baed9
+generated: "2025-12-01T17:31:40.076406+01:00"
diff --git a/charts/streams-app/Chart.yaml b/charts/streams-app/Chart.yaml
index 5289fefa8..72b5d5160 100644
--- a/charts/streams-app/Chart.yaml
+++ b/charts/streams-app/Chart.yaml
@@ -7,6 +7,6 @@ maintainers:
     email: opensource@bakdata.com
     url: bakdata.com
 dependencies:
-  - name: common-app
+  - name: kafka-app
     version: "0.1.0"
-    repository: "file://../common-app"
+    repository: "file://../kafka-app"
diff --git a/charts/streams-app/templates/configmap.yaml b/charts/streams-app/templates/configmap.yaml
index efbeffd77..82b6ff825 100644
--- a/charts/streams-app/templates/configmap.yaml
+++ b/charts/streams-app/templates/configmap.yaml
@@ -1 +1 @@
-{{- include "common-app.configmap" . -}}
+{{- include "kafka-app.configmap" . -}}
diff --git a/charts/streams-app/templates/deployment.yaml b/charts/streams-app/templates/deployment.yaml
index db5ca18ed..59a0f06ff 100644
--- a/charts/streams-app/templates/deployment.yaml
+++ b/charts/streams-app/templates/deployment.yaml
@@ -1 +1 @@
-{{- include "common-app.deployment" . -}}
+{{- include "kafka-app.deployment" . -}}
diff --git a/charts/streams-app/templates/jmx-configmap.yaml b/charts/streams-app/templates/jmx-configmap.yaml
index cbc49b3fe..c5f3719ab 100644
--- a/charts/streams-app/templates/jmx-configmap.yaml
+++ b/charts/streams-app/templates/jmx-configmap.yaml
@@ -1 +1 @@
-{{- include "common-app.jmx-configmap" . -}}
+{{- include "kafka-app.jmx-configmap" . -}}
diff --git a/charts/streams-app/templates/scaled-object.yaml b/charts/streams-app/templates/scaled-object.yaml
index b6797d449..77c6bd642 100644
--- a/charts/streams-app/templates/scaled-object.yaml
+++ b/charts/streams-app/templates/scaled-object.yaml
@@ -1 +1 @@
-{{- include "common-app.scaled-object" . -}}
+{{- include "kafka-app.scaled-object" . -}}
diff --git a/charts/streams-app/templates/secrets.yaml b/charts/streams-app/templates/secrets.yaml
index 8840d9354..57b5ed8c4 100644
--- a/charts/streams-app/templates/secrets.yaml
+++ b/charts/streams-app/templates/secrets.yaml
@@ -1 +1 @@
-{{- include "common-app.secrets" . -}}
+{{- include "kafka-app.secrets" . -}}
diff --git a/charts/streams-app/templates/service.yaml b/charts/streams-app/templates/service.yaml
index 8968b3874..fcf2f190a 100644
--- a/charts/streams-app/templates/service.yaml
+++ b/charts/streams-app/templates/service.yaml
@@ -1 +1 @@
-{{- include "common-app.service" . -}}
+{{- include "kafka-app.service" . -}}