diff --git a/charts/radar-appserver/Chart.yaml b/charts/radar-appserver/Chart.yaml
index eec69884..3629b6ae 100644
--- a/charts/radar-appserver/Chart.yaml
+++ b/charts/radar-appserver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "2.4.0"
+appVersion: "2.4.1"
 description: A Helm chart for the backend application of RADAR-base Appserver
 name: radar-appserver
 version: 0.2.0
diff --git a/charts/radar-appserver/README.md b/charts/radar-appserver/README.md
index 300948b9..7cbe9509 100644
--- a/charts/radar-appserver/README.md
+++ b/charts/radar-appserver/README.md
@@ -3,7 +3,7 @@
 # radar-appserver
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/radar-appserver)](https://artifacthub.io/packages/helm/radar-base/radar-appserver)
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 A Helm chart for the backend application of RADAR-base Appserver
 
@@ -32,7 +32,7 @@ A Helm chart for the backend application of RADAR-base Appserver
 |-----|------|---------|-------------|
 | replicaCount | int | `2` | Number of radar-appserver replicas to deploy |
 | image.repository | string | `"radarbase/radar-appserver"` | radar-appserver image repository |
-| image.tag | string | `"2.4.0"` | radar-appserver image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
+| image.tag | string | `"2.4.1"` | radar-appserver image tag (immutable tags are recommended) Overrides the image tag whose default is the chart appVersion. |
 | image.pullPolicy | string | `"IfNotPresent"` | radar-appserver image pull policy |
 | imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override radar-appserver.fullname template with a string (will prepend the release name) |
diff --git a/charts/radar-appserver/values.yaml b/charts/radar-appserver/values.yaml
index 1ad44208..cc2317d1 100644
--- a/charts/radar-appserver/values.yaml
+++ b/charts/radar-appserver/values.yaml
@@ -10,7 +10,7 @@ image:
   repository: radarbase/radar-appserver
   # -- radar-appserver image tag (immutable tags are recommended)
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 2.4.0
+  tag: 2.4.1
   # -- radar-appserver image pull policy
   pullPolicy: IfNotPresent
 
diff --git a/charts/radar-fitbit-connector/templates/deployment.yaml b/charts/radar-fitbit-connector/templates/deployment.yaml
index fb26e781..969a96de 100644
--- a/charts/radar-fitbit-connector/templates/deployment.yaml
+++ b/charts/radar-fitbit-connector/templates/deployment.yaml
@@ -91,7 +91,7 @@ spec:
           - name: CONNECT_LOG4J_LOGGERS
             value: "org.reflections=ERROR"
           - name: WAIT_FOR_KAFKA
-            value: {{ if .Values.kafka_wait.enabled }}1{{ else }}0{{ end }}
+            value: {{ if .Values.kafka_wait.enabled }}"1"{{ else }}"0"{{ end }}
           {{- if and .Values.kafka_wait.enabled .Values.kafka_wait.properties }}
           - name: COMMAND_CONFIG_FILE_PATH
             value: /etc/kafka-connect/source-fitbit/kafka-wait.properties