diff --git a/.helmdocsignore b/.helmdocsignore
index 13ea6c3c..7efa7808 100644
--- a/.helmdocsignore
+++ b/.helmdocsignore
@@ -1,4 +1,3 @@
-charts/kafka-manager/
 charts/radar-backend/
 charts/smtp/
 external/
diff --git a/charts/app-config/Chart.yaml b/charts/app-config/Chart.yaml
index b11f6fc7..51505d3e 100644
--- a/charts/app-config/Chart.yaml
+++ b/charts/app-config/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.5.0"
 description: A Helm chart for RADAR-base application config (app-config) backend service which is used as mobile app configuration engine with per-project and per-user configuration.
 name: app-config
-version: 1.2.0
+version: 1.3.0
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/app-config
diff --git a/charts/app-config/README.md b/charts/app-config/README.md
index de4c19a6..08d16b2c 100644
--- a/charts/app-config/README.md
+++ b/charts/app-config/README.md
@@ -3,7 +3,7 @@
 # app-config
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/app-config)](https://artifacthub.io/packages/helm/radar-base/app-config)
 
-![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
+![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
 
 A Helm chart for RADAR-base application config (app-config) backend service which is used as mobile app configuration engine with per-project and per-user configuration.
 
@@ -32,8 +32,8 @@ A Helm chart for RADAR-base application config (app-config) backend service whic
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | replicaCount | int | `2` | Number of Appconfig replicas to deploy |
-| image.repository | string | `"radarbase/radar-app-config"` | Appconfig image repository |
-| image.tag | string | `"0.5.0"` | Appconfig image tag (immutable tags are recommended) |
+| image.repository | string | `"radarbase/radar-app-config"` | Appconfig image repositorys |
+| image.tag | string | `nil` | Appconfig image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | Appconfig image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override appconfig.fullname template with a string (will prepend the release name) |
diff --git a/charts/app-config/templates/deployment.yaml b/charts/app-config/templates/deployment.yaml
index 1a4f0729..1f7c1d72 100644
--- a/charts/app-config/templates/deployment.yaml
+++ b/charts/app-config/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: JAVA_OPTS
diff --git a/charts/app-config/values.yaml b/charts/app-config/values.yaml
index 8421c1bf..f942d64a 100644
--- a/charts/app-config/values.yaml
+++ b/charts/app-config/values.yaml
@@ -6,10 +6,11 @@
 replicaCount: 2
 
 image:
-  # -- Appconfig image repository
+  # -- Appconfig image repositorys
   repository: radarbase/radar-app-config
   # -- Appconfig image tag (immutable tags are recommended)
-  tag: 0.5.0
+  # Overrides the image tag whose default is the chart appVersion.
+  tag:
   # -- Appconfig image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/kafka-manager/Chart.yaml b/charts/kafka-manager/Chart.yaml
index ed387edc..811ee69d 100644
--- a/charts/kafka-manager/Chart.yaml
+++ b/charts/kafka-manager/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: kafka-manager
-version: 2.2.0
+version: 2.3.0
 appVersion: 1.3.3.18
 kubeVersion: "^1.8.0-0"
 description: A tool for managing Apache Kafka.
diff --git a/charts/kafka-manager/DOCS.md.gotmpl b/charts/kafka-manager/DOCS.md.gotmpl
new file mode 100644
index 00000000..e69de29b
diff --git a/charts/kafka-manager/README.md b/charts/kafka-manager/README.md
index 010b3093..8aa2fdd4 100644
--- a/charts/kafka-manager/README.md
+++ b/charts/kafka-manager/README.md
@@ -1,27 +1,44 @@
 
 
-# kafka-manager
+# Kafka Manager Helm Chart
 
-![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![AppVersion: 1.3.3.18](https://img.shields.io/badge/AppVersion-1.3.3.18-informational?style=flat-square)
+[Kafka Manager](https://github.com/yahoo/kafka-manager) is a tool for managing [Apache Kafka](http://kafka.apache.org/).
 
-A tool for managing Apache Kafka.
+## TL;DR;
 
-**Homepage:** <https://github.com/yahoo/kafka-manager>
+```bash
+$ helm install stable/kafka-manager
+```
 
-## Maintainers
+## Prerequisites
 
-| Name | Email | Url |
-| ---- | ------ | --- |
-| giacomoguiulfo | <giacomoguiulfo@gmail.com> |  |
-| ssalaues | <salim.salaues@scality.com> |  |
+- Kubernetes 1.9+ with Beta APIs enabled
 
-## Source Code
+## Installing the Chart
 
-* <https://github.com/yahoo/kafka-manager>
+To install the chart with the release name `my-release`:
 
-## Requirements
+```bash
+$ helm install --name my-release stable/kafka-manager
+```
 
-Kubernetes: `^1.8.0-0`
+The command deploys Kafka Manager on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```bash
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+
+The following table lists the configurable parameters of the Kafka Manager chart and their default values.
 
 ## Values
 
@@ -46,7 +63,7 @@ Kubernetes: `^1.8.0-0`
 | zookeeper | object | `{"enabled":false,"env":{"ZK_HEAP_SIZE":"1G"},"persistence":{"enabled":false}}` | ---------------------------------------------------------------------------- |
 | zkHosts | string | `"cp-zookeeper:2181"` |  |
 | image.repository | string | `"radarbase/kafka-manager"` |  |
-| image.tag | string | `"1.3.3.18"` |  |
+| image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | disable_tls | bool | `false` | Disable TLS (reconfigures Ingress and sets URLs to use HTTP) |
@@ -57,5 +74,17 @@ Kubernetes: `^1.8.0-0`
 | ingress.hosts | list | `["localhost"]` | Hosts to accept requests from |
 | ingress.tls.secretName | string | `"radar-base-tls"` | TLS Secret Name |
 
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install stable/kafka-manager --name my-release \
+    --set ingress.enabled=true
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install stable/kafka-manager --name my-release -f values.yaml
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
diff --git a/charts/kafka-manager/README.md.gotmpl b/charts/kafka-manager/README.md.gotmpl
new file mode 100644
index 00000000..611d2665
--- /dev/null
+++ b/charts/kafka-manager/README.md.gotmpl
@@ -0,0 +1,56 @@
+# Kafka Manager Helm Chart
+
+[Kafka Manager](https://github.com/yahoo/kafka-manager) is a tool for managing [Apache Kafka](http://kafka.apache.org/).
+
+## TL;DR;
+
+```bash
+$ helm install stable/kafka-manager
+```
+
+## Prerequisites
+
+- Kubernetes 1.9+ with Beta APIs enabled
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```bash
+$ helm install --name my-release stable/kafka-manager
+```
+
+The command deploys Kafka Manager on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```bash
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+
+The following table lists the configurable parameters of the Kafka Manager chart and their default values.
+
+{{ template "chart.valuesSection" . }}
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install stable/kafka-manager --name my-release \
+    --set ingress.enabled=true
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install stable/kafka-manager --name my-release -f values.yaml
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
diff --git a/charts/kafka-manager/templates/deployment.yaml b/charts/kafka-manager/templates/deployment.yaml
index 53f01e9b..091c1343 100644
--- a/charts/kafka-manager/templates/deployment.yaml
+++ b/charts/kafka-manager/templates/deployment.yaml
@@ -23,7 +23,7 @@ spec:
       serviceAccountName: {{ template "kafka-manager.serviceAccountName" . }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: kafka-manager
diff --git a/charts/kafka-manager/templates/job.yaml b/charts/kafka-manager/templates/job.yaml
index 3322fd11..7b8c255c 100644
--- a/charts/kafka-manager/templates/job.yaml
+++ b/charts/kafka-manager/templates/job.yaml
@@ -22,7 +22,7 @@ spec:
             defaultMode: 0744
       containers:
         - name: {{ .Chart.Name }}-bootstrap
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: ["/usr/local/script/addClusters.sh"]
           env:
diff --git a/charts/kafka-manager/values.yaml b/charts/kafka-manager/values.yaml
index 007eda8b..b46bd34a 100644
--- a/charts/kafka-manager/values.yaml
+++ b/charts/kafka-manager/values.yaml
@@ -140,7 +140,8 @@ zkHosts: cp-zookeeper:2181
 ##
 image:
   repository: radarbase/kafka-manager
-  tag: 1.3.3.18
+  # -- Overrides the image tag whose default is the chart appVersion.
+  tag:
   pullPolicy: IfNotPresent
 
 # -- Docker registry secret names as an array
diff --git a/charts/radar-backend/Chart.yaml b/charts/radar-backend/Chart.yaml
index 0212b89d..5d5c82c6 100644
--- a/charts/radar-backend/Chart.yaml
+++ b/charts/radar-backend/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.4.0"
 description: A Helm chart for RADAR-Base backend services which provides a layer to monitor and analyze streams of wearable data and write data to  storage.
 name: radar-backend
-version: 0.2.1
+version: 0.3.0
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-backend
diff --git a/charts/radar-backend/README.md b/charts/radar-backend/README.md
index a28198e7..dfb315bf 100644
--- a/charts/radar-backend/README.md
+++ b/charts/radar-backend/README.md
@@ -1,16 +1,31 @@
+
+
 # radar-backend
+[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-backend)](https://artifacthub.io/packages/helm/radar-base/radar-backend)
 
-![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![AppVersion: 0.4.0](https://img.shields.io/badge/AppVersion-0.4.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.0](https://img.shields.io/badge/AppVersion-0.4.0-informational?style=flat-square)
 
 A Helm chart for RADAR-Base backend services which provides a layer to monitor and analyze streams of wearable data and write data to  storage.
 
+**Homepage:** <https://radar-base.org>
+
 ## Maintainers
 
 | Name | Email | Url |
 | ---- | ------ | --- |
-| Keyvan Hedayati | keyvan@thehyve.nl | https://www.thehyve.nl |
-| Joris Borgdorff | joris@thehyve.nl | https://www.thehyve.nl/experts/joris-borgdorff |
-| Nivethika Mahasivam | nivethika@thehyve.nl | https://www.thehyve.nl/experts/nivethika-mahasivam |
+| Keyvan Hedayati | <keyvan@thehyve.nl> | <https://www.thehyve.nl> |
+| Joris Borgdorff | <joris@thehyve.nl> | <https://www.thehyve.nl/experts/joris-borgdorff> |
+| Nivethika Mahasivam | <nivethika@thehyve.nl> | <https://www.thehyve.nl/experts/nivethika-mahasivam> |
+
+## Source Code
+
+* <https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-backend>
+* <https://github.com/RADAR-base/RADAR-Appserver>
+
+## Prerequisites
+* Kubernetes 1.22+
+* Kubectl 1.22+
+* Helm 3.1.0+
 
 ## Values
 
@@ -18,7 +33,7 @@ A Helm chart for RADAR-Base backend services which provides a layer to monitor a
 |-----|------|---------|-------------|
 | replicaCount | int | `2` |  |
 | image.repository | string | `"radarbase/radar-backend"` |  |
-| image.tag | string | `"0.4.0"` |  |
+| image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-backend.fullname template with a string (will prepend the release name) |
@@ -32,17 +47,14 @@ A Helm chart for RADAR-Base backend services which provides a layer to monitor a
 | nodeSelector | object | `{}` |  |
 | tolerations | list | `[]` |  |
 | affinity | object | `{}` |  |
+| extraEnv[0].name | string | `"TOPIC_LIST"` |  |
+| extraEnv[0].value | string | `"application_record_counts"` |  |
 | zookeeper | string | `"cp-zookeeper-headless:2181"` |  |
 | kafka | string | `"cp-kafka-headless:9092"` |  |
 | rest_proxy | string | `"http://cp-kafka-rest:8082"` |  |
 | schema_registry | string | `"http://cp-schema-registry:8081"` |  |
 | kafka_num_brokers | string | `"3"` |  |
-| extraEnv[0].name | string | `"TOPIC_LIST"` |  |
-| extraEnv[0].value | string | `"application_record_counts"` |  |
 | smtp.host | string | `"smtp"` |  |
 | smtp.port | int | `25` |  |
 | smtp.user | string | `"user@example.com"` |  |
 | persistence.enabled | bool | `false` |  |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/charts/radar-backend/templates/deployment.yaml b/charts/radar-backend/templates/deployment.yaml
index d37c4b51..36415017 100644
--- a/charts/radar-backend/templates/deployment.yaml
+++ b/charts/radar-backend/templates/deployment.yaml
@@ -47,7 +47,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - radar-backend
diff --git a/charts/radar-backend/values.yaml b/charts/radar-backend/values.yaml
index 8e1a90f1..72869c34 100644
--- a/charts/radar-backend/values.yaml
+++ b/charts/radar-backend/values.yaml
@@ -6,7 +6,8 @@ replicaCount: 2
 
 image:
   repository: radarbase/radar-backend
-  tag: 0.4.0
+  # -- Overrides the image tag whose default is the chart appVersion.
+  tag:
   pullPolicy: IfNotPresent
 
 # -- Docker registry secret names as an array
diff --git a/charts/radar-integration/Chart.yaml b/charts/radar-integration/Chart.yaml
index b33fe661..747c8415 100644
--- a/charts/radar-integration/Chart.yaml
+++ b/charts/radar-integration/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "1.0.4"
 description: A Helm chart for RADAR-Base REDCap survey integration application.
 name: radar-integration
-version: 0.6.0
+version: 0.7.0
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-integration
diff --git a/charts/radar-integration/README.md b/charts/radar-integration/README.md
index b1c4efcd..00a7d45a 100644
--- a/charts/radar-integration/README.md
+++ b/charts/radar-integration/README.md
@@ -3,7 +3,7 @@
 # radar-integration
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-integration)](https://artifacthub.io/packages/helm/radar-base/radar-integration)
 
-![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.4](https://img.shields.io/badge/AppVersion-1.0.4-informational?style=flat-square)
+![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.4](https://img.shields.io/badge/AppVersion-1.0.4-informational?style=flat-square)
 
 A Helm chart for RADAR-Base REDCap survey integration application.
 
@@ -32,7 +32,7 @@ A Helm chart for RADAR-Base REDCap survey integration application.
 |-----|------|---------|-------------|
 | replicaCount | int | `2` | Number replicas to deploy |
 | image.repository | string | `"radarbase/radar-redcapintegration"` | radar-integration image repository |
-| image.tag | string | `"1.0.4"` | radar-integration image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `nil` | radar-integration image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | radar-integration image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-integration.fullname template with a string (will prepend the release name) |
diff --git a/charts/radar-integration/templates/deployment.yaml b/charts/radar-integration/templates/deployment.yaml
index b8044136..c52de513 100644
--- a/charts/radar-integration/templates/deployment.yaml
+++ b/charts/radar-integration/templates/deployment.yaml
@@ -44,7 +44,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/radar-integration/values.yaml b/charts/radar-integration/values.yaml
index fe21e687..4dc1e9a9 100644
--- a/charts/radar-integration/values.yaml
+++ b/charts/radar-integration/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: radarbase/radar-redcapintegration
   # -- radar-integration image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 1.0.4
+  tag:
   # -- radar-integration image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/radar-oura-connector/Chart.yaml b/charts/radar-oura-connector/Chart.yaml
index e7ac6dcc..86e7107f 100644
--- a/charts/radar-oura-connector/Chart.yaml
+++ b/charts/radar-oura-connector/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.5.0"
+appVersion: "0.5.3"
 description: A Helm chart for RADAR-base oura connector. This application collects data from participants via the Oura Web API.
 name: radar-oura-connector
-version: 0.0.3
+version: 0.0.4
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-oura-connector
diff --git a/charts/radar-oura-connector/README.md b/charts/radar-oura-connector/README.md
index 886707b0..90974bfd 100644
--- a/charts/radar-oura-connector/README.md
+++ b/charts/radar-oura-connector/README.md
@@ -3,7 +3,7 @@
 # radar-oura-connector
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-oura-connector)](https://artifacthub.io/packages/helm/radar-base/radar-oura-connector)
 
-![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square)
+![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.3](https://img.shields.io/badge/AppVersion-0.5.3-informational?style=flat-square)
 
 A Helm chart for RADAR-base oura connector. This application collects data from participants via the Oura Web API.
 
@@ -34,7 +34,7 @@ A Helm chart for RADAR-base oura connector. This application collects data from
 |-----|------|---------|-------------|
 | replicaCount | int | `1` | Number of radar-oura-connector replicas to deploy |
 | image.repository | string | `"radarbase/kafka-connect-rest-oura-source"` | radar-oura-connector image repository |
-| image.tag | string | `"0.5.0"` | radar-oura-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `nil` | radar-oura-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | radar-oura-connector image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-oura-connector.fullname template with a string (will prepend the release name) |
diff --git a/charts/radar-oura-connector/templates/deployment.yaml b/charts/radar-oura-connector/templates/deployment.yaml
index 2ec5905f..16167031 100644
--- a/charts/radar-oura-connector/templates/deployment.yaml
+++ b/charts/radar-oura-connector/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: CONNECT_BOOTSTRAP_SERVERS
diff --git a/charts/radar-oura-connector/values.yaml b/charts/radar-oura-connector/values.yaml
index 85dcab8b..a4d213a2 100644
--- a/charts/radar-oura-connector/values.yaml
+++ b/charts/radar-oura-connector/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: radarbase/kafka-connect-rest-oura-source
   # -- radar-oura-connector image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.5.0
+  tag:
   # -- radar-oura-connector image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/radar-output/Chart.yaml b/charts/radar-output/Chart.yaml
index 9ec844b5..ce70e795 100644
--- a/charts/radar-output/Chart.yaml
+++ b/charts/radar-output/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "2.3.1"
 description: A Helm chart for RADAR-base output restructure service. This application reads data from intermediate storage and restructure the data into project-> subject-id-> data topic -> data split per hour. This service offers few options to choose the source and target of the pipeline.
 name: radar-output
-version: 0.4.1
+version: 0.5.0
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-output
diff --git a/charts/radar-output/README.md b/charts/radar-output/README.md
index af69956b..89760a1d 100644
--- a/charts/radar-output/README.md
+++ b/charts/radar-output/README.md
@@ -3,7 +3,7 @@
 # radar-output
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-output)](https://artifacthub.io/packages/helm/radar-base/radar-output)
 
-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
+![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
 
 A Helm chart for RADAR-base output restructure service. This application reads data from intermediate storage and restructure the data into project-> subject-id-> data topic -> data split per hour. This service offers few options to choose the source and target of the pipeline.
 
@@ -33,7 +33,7 @@ A Helm chart for RADAR-base output restructure service. This application reads d
 |-----|------|---------|-------------|
 | replicaCount | int | `1` | Number of radar-output replicas to deploy |
 | image.repository | string | `"radarbase/radar-output-restructure"` | radar-output image repository |
-| image.tag | string | `"2.3.1"` | radar-output image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `nil` | radar-output image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | radar-output image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-output.fullname template with a string (will prepend the release name) |
diff --git a/charts/radar-output/templates/deployment.yaml b/charts/radar-output/templates/deployment.yaml
index d53ef908..3520372e 100644
--- a/charts/radar-output/templates/deployment.yaml
+++ b/charts/radar-output/templates/deployment.yaml
@@ -49,7 +49,7 @@ spec:
         - name: output
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - radar-output-restructure
diff --git a/charts/radar-output/values.yaml b/charts/radar-output/values.yaml
index bd74e858..05134fa7 100644
--- a/charts/radar-output/values.yaml
+++ b/charts/radar-output/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: radarbase/radar-output-restructure
   # -- radar-output image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 2.3.1
+  tag:
   # -- radar-output image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/radar-push-endpoint/Chart.yaml b/charts/radar-push-endpoint/Chart.yaml
index d2fbd683..2c5d7085 100644
--- a/charts/radar-push-endpoint/Chart.yaml
+++ b/charts/radar-push-endpoint/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.2.2"
+appVersion: "0.3.1"
 description: A Helm chart for RADAR-base Push Endpoint. REST Gateway to Kafka, for incoming data from Push or Subscription based WEB APIs. It performs authentication, authorization and content validation. For more details of the configurations, see https://github.com/RADAR-base/RADAR-PushEndpoint.
 name: radar-push-endpoint
-version: 0.3.1
+version: 0.3.2
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-push-endpoint
diff --git a/charts/radar-push-endpoint/README.md b/charts/radar-push-endpoint/README.md
index ccb837a8..b057b6e4 100644
--- a/charts/radar-push-endpoint/README.md
+++ b/charts/radar-push-endpoint/README.md
@@ -3,7 +3,7 @@
 # radar-push-endpoint
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-push-endpoint)](https://artifacthub.io/packages/helm/radar-base/radar-push-endpoint)
 
-![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.2](https://img.shields.io/badge/AppVersion-0.2.2-informational?style=flat-square)
+![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
 
 A Helm chart for RADAR-base Push Endpoint. REST Gateway to Kafka, for incoming data from Push or Subscription based WEB APIs. It performs authentication, authorization and content validation. For more details of the configurations, see https://github.com/RADAR-base/RADAR-PushEndpoint.
 
@@ -32,7 +32,7 @@ A Helm chart for RADAR-base Push Endpoint. REST Gateway to Kafka, for incoming d
 |-----|------|---------|-------------|
 | replicaCount | int | `2` | Number of radar-push-endpoint replicas to deploy |
 | image.repository | string | `"radarbase/radar-push-endpoint"` | radar-push-endpoint image repository |
-| image.tag | string | `"0.2.2"` | radar-push-endpoint image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `nil` | radar-push-endpoint image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | radar-push-endpoint image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-push-endpoint.fullname template with a string (will prepend the release name) |
diff --git a/charts/radar-push-endpoint/templates/deployment.yaml b/charts/radar-push-endpoint/templates/deployment.yaml
index e405d6db..4adbf0ab 100644
--- a/charts/radar-push-endpoint/templates/deployment.yaml
+++ b/charts/radar-push-endpoint/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
           - mountPath: /etc/radar-push-endpoint/
             name: gateway-jmx-configmap
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - radar-push-endpoint
diff --git a/charts/radar-push-endpoint/values.yaml b/charts/radar-push-endpoint/values.yaml
index 3d59bbc9..a88849a5 100644
--- a/charts/radar-push-endpoint/values.yaml
+++ b/charts/radar-push-endpoint/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: radarbase/radar-push-endpoint
   # -- radar-push-endpoint image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.2.2
+  tag:
   # -- radar-push-endpoint image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/radar-s3-connector/Chart.yaml b/charts/radar-s3-connector/Chart.yaml
index d00f7572..cce67a17 100644
--- a/charts/radar-s3-connector/Chart.yaml
+++ b/charts/radar-s3-connector/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "7.6.0-hotfix"
 description: A Helm chart for RADAR-base s3 connector. This connector uses Confluent s3 connector with a custom data transformers. These configurations enable a sink connector. See full list of properties here https://docs.confluent.io/kafka-connect-s3-sink/current/configuration_options.html#s3-configuration-options
 name: radar-s3-connector
-version: 0.3.4
+version: 0.4.0
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-s3-connector
diff --git a/charts/radar-s3-connector/README.md b/charts/radar-s3-connector/README.md
index e3b23b3e..84f7a144 100644
--- a/charts/radar-s3-connector/README.md
+++ b/charts/radar-s3-connector/README.md
@@ -3,7 +3,7 @@
 # radar-s3-connector
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-s3-connector)](https://artifacthub.io/packages/helm/radar-base/radar-s3-connector)
 
-![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.6.0-hotfix](https://img.shields.io/badge/AppVersion-7.6.0--hotfix-informational?style=flat-square)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.6.0-hotfix](https://img.shields.io/badge/AppVersion-7.6.0--hotfix-informational?style=flat-square)
 
 A Helm chart for RADAR-base s3 connector. This connector uses Confluent s3 connector with a custom data transformers. These configurations enable a sink connector. See full list of properties here https://docs.confluent.io/kafka-connect-s3-sink/current/configuration_options.html#s3-configuration-options
 
@@ -34,7 +34,7 @@ A Helm chart for RADAR-base s3 connector. This connector uses Confluent s3 conne
 |-----|------|---------|-------------|
 | replicaCount | int | `1` | Number of radar-s3-connector replicas to deploy |
 | image.repository | string | `"radarbase/kafka-connect-transform-s3"` | radar-s3-connector image repository |
-| image.tag | string | `"7.6.0-hotfix"` | radar-s3-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `nil` | radar-s3-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | radar-s3-connector image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-s3-connector.fullname template with a string (will prepend the release name) |
diff --git a/charts/radar-s3-connector/templates/deployment.yaml b/charts/radar-s3-connector/templates/deployment.yaml
index a548633a..e0580bf3 100644
--- a/charts/radar-s3-connector/templates/deployment.yaml
+++ b/charts/radar-s3-connector/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: CONNECT_BOOTSTRAP_SERVERS
@@ -238,7 +238,7 @@ spec:
       {{- if .Values.initTopics.enabled }}
       initContainers:
         - name: init-topics
-          image: {{ .Values.initTopics.image.repository }}:{{ .Values.initTopics.image.tag }}
+          image: {{ .Values.initTopics.image.repository }}:{{ .Values.initTopics.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.initTopics.image.pullPolicy }}
           command:
             - /bin/sh
diff --git a/charts/radar-s3-connector/values.yaml b/charts/radar-s3-connector/values.yaml
index 4e2fb196..2cbef43a 100644
--- a/charts/radar-s3-connector/values.yaml
+++ b/charts/radar-s3-connector/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: radarbase/kafka-connect-transform-s3
   # -- radar-s3-connector image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "7.6.0-hotfix"
+  tag:
   # -- radar-s3-connector image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/radar-upload-connect-backend/Chart.yaml b/charts/radar-upload-connect-backend/Chart.yaml
index c63f7127..9cc7b671 100644
--- a/charts/radar-upload-connect-backend/Chart.yaml
+++ b/charts/radar-upload-connect-backend/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.5.10"
+appVersion: "0.5.12"
 description: A Helm chart for RADAR-base upload connector backend application. This application is an upload system that stores uploaded data and its metadata in PostgreSQL for later processing.
 name: radar-upload-connect-backend
-version: 0.4.0
+version: 0.4.1
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-upload-connect-backend
diff --git a/charts/radar-upload-connect-backend/README.md b/charts/radar-upload-connect-backend/README.md
index 1c93e2aa..2b53a7ff 100644
--- a/charts/radar-upload-connect-backend/README.md
+++ b/charts/radar-upload-connect-backend/README.md
@@ -3,7 +3,7 @@
 # radar-upload-connect-backend
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-upload-connect-backend)](https://artifacthub.io/packages/helm/radar-base/radar-upload-connect-backend)
 
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square)
+![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.12](https://img.shields.io/badge/AppVersion-0.5.12-informational?style=flat-square)
 
 A Helm chart for RADAR-base upload connector backend application. This application is an upload system that stores uploaded data and its metadata in PostgreSQL for later processing.
 
@@ -33,7 +33,7 @@ A Helm chart for RADAR-base upload connector backend application. This applicati
 |-----|------|---------|-------------|
 | replicaCount | int | `2` | Number of radar-upload-connect-backend replicas to deploy |
 | image.repository | string | `"radarbase/radar-upload-connect-backend"` | radar-upload-connect-backend image repository |
-| image.tag | string | `"0.5.10"` | radar-upload-connect-backend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `nil` | radar-upload-connect-backend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | radar-upload-connect-backend image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-upload-connect-backend.fullname template with a string (will prepend the release name) |
diff --git a/charts/radar-upload-connect-backend/templates/deployment.yaml b/charts/radar-upload-connect-backend/templates/deployment.yaml
index f2ce20c8..d832a155 100644
--- a/charts/radar-upload-connect-backend/templates/deployment.yaml
+++ b/charts/radar-upload-connect-backend/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - radar-upload-backend
diff --git a/charts/radar-upload-connect-backend/values.yaml b/charts/radar-upload-connect-backend/values.yaml
index ecea1109..58042931 100644
--- a/charts/radar-upload-connect-backend/values.yaml
+++ b/charts/radar-upload-connect-backend/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: radarbase/radar-upload-connect-backend
   # -- radar-upload-connect-backend image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.5.10
+  tag:
   # -- radar-upload-connect-backend image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/radar-upload-connect-frontend/Chart.yaml b/charts/radar-upload-connect-frontend/Chart.yaml
index 0b683497..8fe36569 100644
--- a/charts/radar-upload-connect-frontend/Chart.yaml
+++ b/charts/radar-upload-connect-frontend/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.5.10"
+appVersion: "0.5.12"
 description: A Helm chart for RADAR-base upload connector frontend application that provides a UI for uploading files and sending them to the upload-backend.
 name: radar-upload-connect-frontend
-version: 0.4.0
+version: 0.4.1
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-upload-connect-frontend
diff --git a/charts/radar-upload-connect-frontend/README.md b/charts/radar-upload-connect-frontend/README.md
index 431054ff..15f71318 100644
--- a/charts/radar-upload-connect-frontend/README.md
+++ b/charts/radar-upload-connect-frontend/README.md
@@ -3,7 +3,7 @@
 # radar-upload-connect-frontend
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-upload-connect-frontend)](https://artifacthub.io/packages/helm/radar-base/radar-upload-connect-frontend)
 
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square)
+![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.12](https://img.shields.io/badge/AppVersion-0.5.12-informational?style=flat-square)
 
 A Helm chart for RADAR-base upload connector frontend application that provides a UI for uploading files and sending them to the upload-backend.
 
@@ -33,7 +33,7 @@ A Helm chart for RADAR-base upload connector frontend application that provides
 |-----|------|---------|-------------|
 | replicaCount | int | `2` | Number of radar-upload-connect-frontend replicas to deploy |
 | image.repository | string | `"radarbase/radar-upload-connect-frontend"` | radar-upload-connect-frontend image repository |
-| image.tag | string | `"0.5.10"` | radar-upload-connect-frontend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `nil` | radar-upload-connect-frontend image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | radar-upload-connect-frontend image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-upload-connect-frontend.fullname template with a string (will prepend the release name) |
diff --git a/charts/radar-upload-connect-frontend/templates/deployment.yaml b/charts/radar-upload-connect-frontend/templates/deployment.yaml
index b91d6db7..05363ff8 100644
--- a/charts/radar-upload-connect-frontend/templates/deployment.yaml
+++ b/charts/radar-upload-connect-frontend/templates/deployment.yaml
@@ -43,7 +43,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: VUE_APP_BASE_URL
diff --git a/charts/radar-upload-connect-frontend/values.yaml b/charts/radar-upload-connect-frontend/values.yaml
index aaf6ade5..fa8eae4b 100644
--- a/charts/radar-upload-connect-frontend/values.yaml
+++ b/charts/radar-upload-connect-frontend/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: radarbase/radar-upload-connect-frontend
   # -- radar-upload-connect-frontend image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.5.10
+  tag:
   # -- radar-upload-connect-frontend image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/radar-upload-source-connector/Chart.yaml b/charts/radar-upload-source-connector/Chart.yaml
index f35af0ef..ea8715c0 100644
--- a/charts/radar-upload-source-connector/Chart.yaml
+++ b/charts/radar-upload-source-connector/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.5.10"
+appVersion: "0.5.12"
 description: A Helm chart for RADAR-base upload kafka connector. This is used for reading uploaded data from backend and sending them to Kafka cluster for later processing.
 name: radar-upload-source-connector
-version: 0.3.1
+version: 0.3.2
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
 sources:
 - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/radar-upload-source-connector
diff --git a/charts/radar-upload-source-connector/README.md b/charts/radar-upload-source-connector/README.md
index 9ebfbf57..16b8dac9 100644
--- a/charts/radar-upload-source-connector/README.md
+++ b/charts/radar-upload-source-connector/README.md
@@ -3,7 +3,7 @@
 # radar-upload-source-connector
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-upload-source-connector)](https://artifacthub.io/packages/helm/radar-base/radar-upload-source-connector)
 
-![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.10](https://img.shields.io/badge/AppVersion-0.5.10-informational?style=flat-square)
+![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.12](https://img.shields.io/badge/AppVersion-0.5.12-informational?style=flat-square)
 
 A Helm chart for RADAR-base upload kafka connector. This is used for reading uploaded data from backend and sending them to Kafka cluster for later processing.
 
@@ -33,7 +33,7 @@ A Helm chart for RADAR-base upload kafka connector. This is used for reading upl
 |-----|------|---------|-------------|
 | replicaCount | int | `2` | Number of radar-upload-source-connector replicas to deploy |
 | image.repository | string | `"radarbase/radar-connect-upload-source"` | radar-upload-source-connector image repository |
-| image.tag | string | `"0.5.10"` | radar-upload-source-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `nil` | radar-upload-source-connector image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-upload-source-connector.fullname template with a string (will prepend the release name) |
 | fullnameOverride | string | `""` | String to fully override radar-upload-source-connector.fullname template with a string |
diff --git a/charts/radar-upload-source-connector/templates/deployment.yaml b/charts/radar-upload-source-connector/templates/deployment.yaml
index 833dfc73..0532ef18 100644
--- a/charts/radar-upload-source-connector/templates/deployment.yaml
+++ b/charts/radar-upload-source-connector/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: CONNECT_BOOTSTRAP_SERVERS
diff --git a/charts/radar-upload-source-connector/values.yaml b/charts/radar-upload-source-connector/values.yaml
index 2a2e3e18..5f56bba9 100644
--- a/charts/radar-upload-source-connector/values.yaml
+++ b/charts/radar-upload-source-connector/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: radarbase/radar-connect-upload-source
   # -- radar-upload-source-connector image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 0.5.10
+  tag:
   # -- radar-upload-source-connector image pull policy
 
 # -- Docker registry secret names as an array
diff --git a/charts/s3-proxy/Chart.yaml b/charts/s3-proxy/Chart.yaml
index 5a8315a5..e3bd1979 100644
--- a/charts/s3-proxy/Chart.yaml
+++ b/charts/s3-proxy/Chart.yaml
@@ -5,7 +5,7 @@ sources: ["https://github.com/gaul/s3proxy"]
 type: application
 home: "https://radar-base.org"
 name: s3-proxy
-version: 0.3.2
+version: 0.4.0
 maintainers:
   - email: keyvan@thehyve.nl
     name: Keyvan Hedayati
diff --git a/charts/s3-proxy/README.md b/charts/s3-proxy/README.md
index 1ad60900..e806fee1 100644
--- a/charts/s3-proxy/README.md
+++ b/charts/s3-proxy/README.md
@@ -3,7 +3,7 @@
 # s3-proxy
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/s3-proxy)](https://artifacthub.io/packages/helm/radar-base/s3-proxy)
 
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
 
 A Helm chart for S3 Proxy. It uses https://hub.docker.com/r/andrewgaul/s3proxy to proxy S3 API requests to any supported cloud provider. For more examples see Find some example configurations at https://github.com/gaul/s3proxy/wiki/Storage-backend-examples.
 
@@ -32,7 +32,7 @@ A Helm chart for S3 Proxy. It uses https://hub.docker.com/r/andrewgaul/s3proxy t
 |-----|------|---------|-------------|
 | replicaCount | int | `1` | Number of s3-proxy replicas to deploy |
 | image.repository | string | `"andrewgaul/s3proxy"` | s3-proxy image repository |
-| image.tag | string | `"sha-abc6d02"` | s3-proxy image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `nil` | s3-proxy image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | s3-proxy image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override s3-proxy.fullname template with a string (will prepend the release name) |
diff --git a/charts/s3-proxy/templates/deployment.yaml b/charts/s3-proxy/templates/deployment.yaml
index a92280d0..ac6eefe6 100644
--- a/charts/s3-proxy/templates/deployment.yaml
+++ b/charts/s3-proxy/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
           - name: S3PROXY_AUTHORIZATION
diff --git a/charts/s3-proxy/values.yaml b/charts/s3-proxy/values.yaml
index eb3f6e78..47c9189e 100644
--- a/charts/s3-proxy/values.yaml
+++ b/charts/s3-proxy/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: andrewgaul/s3proxy
   # -- s3-proxy image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: sha-abc6d02
+  tag:
   # -- s3-proxy image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/velero-s3-deployment/Chart.yaml b/charts/velero-s3-deployment/Chart.yaml
index 742499e1..11705dee 100644
--- a/charts/velero-s3-deployment/Chart.yaml
+++ b/charts/velero-s3-deployment/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Velero S3 deployment, this chart holds resources used by Velero with a deployment to mirror the local object storage to a remote object storage.
 name: velero-s3-deployment
-version: 0.2.3
+version: 0.3.0
 sources: ["https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/velero-s3-deployment"]
 deprecated: false
 type: application
diff --git a/charts/velero-s3-deployment/README.md b/charts/velero-s3-deployment/README.md
index 494c3b84..aeb92b4e 100644
--- a/charts/velero-s3-deployment/README.md
+++ b/charts/velero-s3-deployment/README.md
@@ -3,7 +3,7 @@
 # velero-s3-deployment
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/velero-s3-deployment)](https://artifacthub.io/packages/helm/radar-base/velero-s3-deployment)
 
-![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square)
 
 A Helm chart for Velero S3 deployment, this chart holds resources used by Velero with a deployment to mirror the local object storage to a remote object storage.
 
@@ -39,7 +39,7 @@ A Helm chart for Velero S3 deployment, this chart holds resources used by Velero
 |-----|------|---------|-------------|
 | objectStorageBackupReplicaCount | int | `1` | Number of replicas for object storage backup pod, should be 1 |
 | mc_image.repository | string | `"minio/mc"` | Object storage backup pod image repository |
-| mc_image.tag | string | `"RELEASE.2022-07-06T14-54-36Z"` | Object storage backup pod image tag (immutable tags are recommended) |
+| mc_image.tag | string | `nil` | Object storage backup pod image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | mc_image.pullPolicy | string | `"IfNotPresent"` | Object storage backup pod image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | podSecurityContext | object | `{}` | Configure object storage backup pod pods' Security Context |
diff --git a/charts/velero-s3-deployment/templates/deployment.yaml b/charts/velero-s3-deployment/templates/deployment.yaml
index 4e65af93..36378abb 100644
--- a/charts/velero-s3-deployment/templates/deployment.yaml
+++ b/charts/velero-s3-deployment/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
         - name: intermediate
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.mc_image.repository }}:{{ .Values.mc_image.tag }}"
+          image: "{{ .Values.mc_image.repository }}:{{ .Values.mc_image.tag | default .Chart.AppVersion }}"
           env:
           - name: MC_HOST_local
             value: "http://{{ .Values.local.accessKey }}:{{ .Values.local.secretKey }}@{{ .Values.local.address }}"
@@ -43,7 +43,7 @@ spec:
         - name: output
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.mc_image.repository }}:{{ .Values.mc_image.tag }}"
+          image: "{{ .Values.mc_image.repository }}:{{ .Values.mc_image.tag | default .Chart.AppVersion }}"
           env:
           - name: MC_HOST_local
             value: "http://{{ .Values.local.accessKey }}:{{ .Values.local.secretKey }}@{{ .Values.local.address }}"
diff --git a/charts/velero-s3-deployment/values.yaml b/charts/velero-s3-deployment/values.yaml
index d906ad4a..033929a2 100644
--- a/charts/velero-s3-deployment/values.yaml
+++ b/charts/velero-s3-deployment/values.yaml
@@ -9,7 +9,8 @@ mc_image:
   # -- Object storage backup pod image repository
   repository: minio/mc
   # -- Object storage backup pod image tag (immutable tags are recommended)
-  tag: RELEASE.2022-07-06T14-54-36Z
+  # Overrides the image tag whose default is the chart appVersion.
+  tag:
   # -- Object storage backup pod image pull policy
   pullPolicy: IfNotPresent