diff --git a/helm/bobbycar-core-infra/Chart.yaml b/helm/bobbycar-core-infra/Chart.yaml
index 2e85cad..d147a67 100644
--- a/helm/bobbycar-core-infra/Chart.yaml
+++ b/helm/bobbycar-core-infra/Chart.yaml
@@ -20,7 +20,7 @@ version: 0.1.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 4.5.18
+appVersion: 4.5.24
 
 sources: 
   - https://github.com/sa-mw-dach/bobbycar
diff --git a/helm/bobbycar-core-infra/templates/NOTES.txt b/helm/bobbycar-core-infra/templates/NOTES.txt
index 246f127..8526122 100644
--- a/helm/bobbycar-core-infra/templates/NOTES.txt
+++ b/helm/bobbycar-core-infra/templates/NOTES.txt
@@ -9,5 +9,5 @@ Bobbycar core infrastructure components
 - Datagrid CR and Route
 
 - AMQ Streams Operator Subscription
-- AMQ Streams Kafka Cluster and Topics
+- AMQ Streams Kafka Cluster
 - AMQ Streams Kafka HTTP Bridge Cluster and Route
\ No newline at end of file
diff --git a/helm/bobbycar-core-infra/templates/amq-broker-cr.yaml b/helm/bobbycar-core-infra/templates/amq-broker-cr.yaml
index a6597b1..13ddcfa 100644
--- a/helm/bobbycar-core-infra/templates/amq-broker-cr.yaml
+++ b/helm/bobbycar-core-infra/templates/amq-broker-cr.yaml
@@ -2,7 +2,7 @@
 apiVersion: broker.amq.io/v2alpha3
 kind: ActiveMQArtemis
 metadata:
-  name: {{ .Values.amqBroker.name }}
+  name: bobbycar-amq-mqtt
   namespace: {{ .Values.namespace }}
 spec:
   deploymentPlan:
diff --git a/helm/bobbycar-core-infra/templates/amq-operator-subscription.yaml b/helm/bobbycar-core-infra/templates/amq-operator-subscription.yaml
index f36b302..18d2b1e 100644
--- a/helm/bobbycar-core-infra/templates/amq-operator-subscription.yaml
+++ b/helm/bobbycar-core-infra/templates/amq-operator-subscription.yaml
@@ -2,10 +2,10 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: {{ .Values.amqOperator.name }}
+  name: amq-broker
   namespace: {{ .Values.namespace }}
 spec:
-  channel: current
+  channel: {{ .Values.amqOperator.channel }}
   installPlanApproval: {{ .Values.amqOperator.installPlanApproval }}
   name: amq-broker
   source: redhat-operators
diff --git a/helm/bobbycar-core-infra/templates/amq-streams-operator-subscription.yaml b/helm/bobbycar-core-infra/templates/amq-streams-operator-subscription.yaml
index 9376a36..446707d 100644
--- a/helm/bobbycar-core-infra/templates/amq-streams-operator-subscription.yaml
+++ b/helm/bobbycar-core-infra/templates/amq-streams-operator-subscription.yaml
@@ -2,10 +2,10 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: {{ .Values.strimziOperator.name }}
+  name: amq-streams
   namespace: {{ .Values.namespace }}
 spec:
-  channel: stable
+  channel: {{ .Values.strimziOperator.channel }}
   installPlanApproval: {{ .Values.strimziOperator.installPlanApproval }}
   name: amq-streams
   source: redhat-operators
diff --git a/helm/bobbycar-core-infra/templates/camel-k-operator-subscription.yaml b/helm/bobbycar-core-infra/templates/camel-k-operator-subscription.yaml
index dcdda1a..dbdbcb4 100644
--- a/helm/bobbycar-core-infra/templates/camel-k-operator-subscription.yaml
+++ b/helm/bobbycar-core-infra/templates/camel-k-operator-subscription.yaml
@@ -2,10 +2,10 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: {{ .Values.camelKOperator.name }}
+  name: red-hat-camel-k
   namespace: {{ .Values.namespace }}
 spec:
-  channel: techpreview
+  channel: {{ .Values.camelKOperator.channel }}
   installPlanApproval: {{ .Values.camelKOperator.installPlanApproval }}
   name: red-hat-camel-k
   source: redhat-operators
diff --git a/helm/bobbycar-core-infra/templates/datagrid-route.yaml b/helm/bobbycar-core-infra/templates/datagrid-route.yaml
index f2ea157..32d8ef8 100644
--- a/helm/bobbycar-core-infra/templates/datagrid-route.yaml
+++ b/helm/bobbycar-core-infra/templates/datagrid-route.yaml
@@ -5,13 +5,13 @@ metadata:
   name: datagrid
   namespace: {{ .Values.namespace }}
   labels:
-    clusterName: {{ .Values.datagrid.name }}
-    infinispan_cr: {{ .Values.datagrid.name }}
+    clusterName: bobbycar-dg
+    infinispan_cr: bobbycar-dg
 spec:
-  host: {{ .Values.datagrid.name }}-{{ .Values.namespace }}.{{ .Values.ocpDomain }}
+  host: bobbycar-dg-{{ .Values.namespace }}.{{ .Values.ocpDomain }}
   to:
     kind: Service
-    name: {{ .Values.datagrid.name }}
+    name: bobbycar-dg
     weight: 100
   port:
     targetPort: 11222
diff --git a/helm/bobbycar-core-infra/templates/datagrid-subscription.yaml b/helm/bobbycar-core-infra/templates/datagrid-subscription.yaml
index 46805f5..21847e7 100644
--- a/helm/bobbycar-core-infra/templates/datagrid-subscription.yaml
+++ b/helm/bobbycar-core-infra/templates/datagrid-subscription.yaml
@@ -2,10 +2,10 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  name: {{ .Values.datagridOperator.name }}
+  name: datagrid
   namespace: {{ .Values.namespace }}
 spec:
-  channel: 8.0.x
+  channel: {{ .Values.datagridOperator.channel }}
   installPlanApproval: {{ .Values.datagridOperator.installPlanApproval }}
   name: datagrid
   source: redhat-operators
diff --git a/helm/bobbycar-core-infra/templates/datagrid.yaml b/helm/bobbycar-core-infra/templates/datagrid.yaml
index 0a7d686..abe2daf 100644
--- a/helm/bobbycar-core-infra/templates/datagrid.yaml
+++ b/helm/bobbycar-core-infra/templates/datagrid.yaml
@@ -2,19 +2,20 @@
 apiVersion: infinispan.org/v1
 kind: Infinispan
 metadata:
-  name: {{ .Values.datagrid.name }}
+  name: bobbycar-dg
   namespace: {{ .Values.namespace }}
 spec:
   replicas: {{ .Values.datagrid.replicas }}
   service:
-    type: DataGrid
+    type: {{ .Values.datagrid.type }}
     container:
       storage: 2Gi
   container:
-    cpu: '500m'
+    cpu: {{ .Values.datagrid.cpu }}
     extraJvmOpts: '-XX:NativeMemoryTracking=summary'
-    memory: 1Gi
-  expose: {}
+    memory: {{ .Values.datagrid.memory }}
+  expose:
+    type: Route
   logging:
     categories: 
       org.infinispan: info
diff --git a/helm/bobbycar-core-infra/templates/kafka-bridge-route.yaml b/helm/bobbycar-core-infra/templates/kafka-bridge-route.yaml
index cc6c3fa..8aa2389 100644
--- a/helm/bobbycar-core-infra/templates/kafka-bridge-route.yaml
+++ b/helm/bobbycar-core-infra/templates/kafka-bridge-route.yaml
@@ -5,10 +5,10 @@ metadata:
   name: kafka-bridge
   namespace: {{ .Values.namespace }}
 spec:
-  host: {{ .Values.kafka.bridge.name }}-{{ .Values.namespace }}.{{ .Values.ocpDomain }}
+  host: bobbycar-{{ .Values.namespace }}.{{ .Values.ocpDomain }}
   to:
     kind: Service
-    name: {{ .Values.kafka.bridge.name }}-bridge-service
+    name: bobbycar-bridge-service
     weight: 100
   port:
     targetPort: rest-api
diff --git a/helm/bobbycar-core-infra/templates/kafka-bridge.yaml b/helm/bobbycar-core-infra/templates/kafka-bridge.yaml
index 3779cee..6b95e51 100644
--- a/helm/bobbycar-core-infra/templates/kafka-bridge.yaml
+++ b/helm/bobbycar-core-infra/templates/kafka-bridge.yaml
@@ -2,11 +2,11 @@
 apiVersion: kafka.strimzi.io/v1alpha1
 kind: KafkaBridge
 metadata:
-  name: {{ .Values.kafka.bridge.name }}
+  name: bobbycar
   namespace: {{ .Values.namespace }}
 spec:
   replicas: {{ .Values.kafka.bridge.replicas }}
-  bootstrapServers: {{ .Values.kafka.bridge.bootstrapServers }}
+  bootstrapServers: bobbycar-cluster-kafka-bootstrap:9092
   http:
     port: {{ .Values.kafka.bridge.port }}
 {{- end }}  
diff --git a/helm/bobbycar-core-infra/templates/kafka-cr.yaml b/helm/bobbycar-core-infra/templates/kafka-cr.yaml
index 2c96e14..1f7363d 100644
--- a/helm/bobbycar-core-infra/templates/kafka-cr.yaml
+++ b/helm/bobbycar-core-infra/templates/kafka-cr.yaml
@@ -2,7 +2,7 @@
 apiVersion: kafka.strimzi.io/v1beta1
 kind: Kafka
 metadata:
-  name: {{ .Values.kafka.cluster.name }}
+  name: bobbycar-cluster
   namespace: {{ .Values.namespace }}
 spec:
   kafka:
diff --git a/helm/bobbycar-core-infra/templates/kafka-gps-topic.yaml b/helm/bobbycar-core-infra/templates/kafka-gps-topic.yaml
index fb20139..fa814c4 100644
--- a/helm/bobbycar-core-infra/templates/kafka-gps-topic.yaml
+++ b/helm/bobbycar-core-infra/templates/kafka-gps-topic.yaml
@@ -1,16 +1,14 @@
-{{- if .Values.components.enabled.kafka -}}
 apiVersion: kafka.strimzi.io/v1beta1
 kind: KafkaTopic
 metadata:
   name: {{ .Values.kafka.topic.gps.name }}
   namespace: {{ .Values.namespace }}
   labels:
-    strimzi.io/cluster: {{ .Values.kafka.cluster.name }}
+    strimzi.io/cluster: bobbycar-cluster
 spec:
   partitions: {{ .Values.kafka.topic.gps.partitions }}
   replicas: {{ .Values.kafka.topic.gps.replicas }}
   config:
-    retention.ms: 7200000
+    retention.ms: {{ .Values.kafka.topic.gps.retention }}
     segment.bytes: 1073741824
-{{- end }} 
  
diff --git a/helm/bobbycar-core-infra/templates/kafka-metrics-topic.yaml b/helm/bobbycar-core-infra/templates/kafka-metrics-topic.yaml
index 4f092b0..269bb92 100644
--- a/helm/bobbycar-core-infra/templates/kafka-metrics-topic.yaml
+++ b/helm/bobbycar-core-infra/templates/kafka-metrics-topic.yaml
@@ -1,16 +1,14 @@
-{{- if .Values.components.enabled.kafka -}}
 apiVersion: kafka.strimzi.io/v1beta1
 kind: KafkaTopic
 metadata:
   name: {{ .Values.kafka.topic.metrics.name }}
   namespace: {{ .Values.namespace }}
   labels:
-    strimzi.io/cluster: {{ .Values.kafka.cluster.name }}
+    strimzi.io/cluster: bobbycar-cluster
 spec:
   partitions: {{ .Values.kafka.topic.metrics.partitions }}
   replicas: {{ .Values.kafka.topic.metrics.replicas }}
   config:
-    retention.ms: 7200000
+    retention.ms: {{ .Values.kafka.topic.metrics.retention }}
     segment.bytes: 1073741824
-{{- end }} 
  
diff --git a/helm/bobbycar-core-infra/templates/kafka-zonechange-topic.yaml b/helm/bobbycar-core-infra/templates/kafka-zonechange-topic.yaml
index 791468f..258cf9e 100644
--- a/helm/bobbycar-core-infra/templates/kafka-zonechange-topic.yaml
+++ b/helm/bobbycar-core-infra/templates/kafka-zonechange-topic.yaml
@@ -1,16 +1,14 @@
-{{- if .Values.components.enabled.kafka -}}
 apiVersion: kafka.strimzi.io/v1beta1
 kind: KafkaTopic
 metadata:
   name: {{ .Values.kafka.topic.zonechange.name }}
   namespace: {{ .Values.namespace }}
   labels:
-    strimzi.io/cluster: {{ .Values.kafka.cluster.name }}
+    strimzi.io/cluster: bobbycar-cluster
 spec:
   partitions: {{ .Values.kafka.topic.zonechange.partitions }}
   replicas: {{ .Values.kafka.topic.zonechange.replicas }}
   config:
-    retention.ms: 7200000
+    retention.ms: {{ .Values.kafka.topic.zonechange.retention }}
     segment.bytes: 1073741824
-{{- end }} 
  
diff --git a/helm/bobbycar-core-infra/values.yaml b/helm/bobbycar-core-infra/values.yaml
index fc68c35..4f36451 100644
--- a/helm/bobbycar-core-infra/values.yaml
+++ b/helm/bobbycar-core-infra/values.yaml
@@ -2,7 +2,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-namespace: bobbycar
+namespace: bc
 appName: Bobbycar
 ocpDomain: apps.ocp4.stormshift.coe.muc.redhat.com
 
@@ -16,58 +16,59 @@ components:
 
 # AMQ Broker Operator Subscription
 amqOperator:
-  name: amq-broker
   installPlanApproval: Automatic
-  startingCSV: amq-broker-operator.v0.17.0
+  startingCSV: amq-broker-operator.v0.18.0
+  channel: current
 
 # Camel-K Operator Subscription
 camelKOperator:
-  name: red-hat-camel-k
   installPlanApproval: Automatic
   startingCSV: red-hat-camel-k-operator.v1.0.0
+  channel: techpreview
 
 # Datagrid Operator Subscription
 datagridOperator:
-  name: datagrid
   installPlanApproval: Automatic
   startingCSV: datagrid-operator.v8.0.3
+  channel: 8.0.x
 
 # AMQ Streams Operator Subscription
 strimziOperator:
-  name: amq-streams
   installPlanApproval: Automatic
-  startingCSV: amqstreams.v1.6.0  
+  startingCSV: amqstreams.v1.6.1
+  channel: stable
 
 datagrid:
-  name: bobbycar-dg
   replicas: 1
+  type: DataGrid
+  cpu: '500m'
+  memory: 1Gi
 
 amqBroker:
-  name: bobbycar-amq-mqtt
-  instances: 1   
+  instances: 1
   console:
     expose: true  
 
 kafka: 
   cluster:
-    name: bobbycar-cluster
-    brokerReplicas: 1
+    brokerReplicas: 2
     zookeeperReplicas: 3
   bridge: 
-    name: bobbycar
     replicas: 1
-    bootstrapServers: bobbycar-cluster-kafka-bootstrap:9092
     port: 8080
   topic:
     gps:
       name: bobbycar-gps
       partitions: 1
       replicas: 1
+      retention: 60000
     metrics:
       name: bobbycar-metrics
       partitions: 1
-      replicas: 1     
-    zonechange:   
+      replicas: 1
+      retention: 60000
+    zonechange:
       name: bobbycar-zonechange
       partitions: 1
-      replicas: 1
\ No newline at end of file
+      replicas: 1
+      retention: 300000
\ No newline at end of file