diff --git a/etc/base.yaml b/etc/base.yaml
index 3f512e6bc..6ea9341ba 100644
--- a/etc/base.yaml
+++ b/etc/base.yaml
@@ -467,7 +467,7 @@ radar_push_endpoint:
 
 radar_jdbc_connector_agg:
   _install: false
-  _chart_version: 0.4.0
+  _chart_version: 0.4.1
   _extra_timeout: 0
   replicaCount: 1
 
@@ -479,7 +479,7 @@ ksql_server:
   servicePort: 8088
   kafka:
     bootstrapServers: PLAINTEXT://cp-kafka:9092
-  cp-schema-registry: 
+  cp-schema-registry:
     url: http://cp-schema-registry:8081
   ksql:
     headless: false
diff --git a/etc/base.yaml.gotmpl b/etc/base.yaml.gotmpl
index 98d64d7cb..ec1d6aa56 100644
--- a/etc/base.yaml.gotmpl
+++ b/etc/base.yaml.gotmpl
@@ -26,3 +26,10 @@ radar_grafana:
 #radar_appserver:
 #  google_application_credentials: {{ readFile "../etc/radar-appserver/firebase-adminsdk.json" | quote }}
 #*/}}
+
+# Remove below Go comment to read the queries.sql and set the queries
+# in the ksql_server
+#ksql_server:
+#  ksql:
+#    queries: |
+#      {{/*- readFile "cp-ksql-server/queries.sql" | nindent 8 */}}
\ No newline at end of file
diff --git a/etc/cp-ksql-server/values.yaml b/etc/cp-ksql-server/values.yaml
index 03b21c59e..3e6dafb1e 100644
--- a/etc/cp-ksql-server/values.yaml
+++ b/etc/cp-ksql-server/values.yaml
@@ -1,104 +1,3 @@
-# Default values for cp-ksql-server.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-## Image Info
-## ref: https://hub.docker.com/r/confluentinc/cp-ksql-server/
-image: confluentinc/cp-ksqldb-server
-imageTag: 7.2.1
-
-## Specify a imagePullPolicy
-## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
-imagePullPolicy: IfNotPresent
-
-## Specify an array of imagePullSecrets.
-## Secrets must be manually created in the namespace.
-## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod
-imagePullSecrets:
-
-servicePort: 8088
-
-## KSQL JVM Heap Option
-heapOptions: "-Xms512M -Xmx512M"
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-## Custom pod annotations
-podAnnotations: {}
-
-## Node labels for pod assignment
-## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-nodeSelector: {}
-
-## Taints to tolerate on node assignment:
-## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-tolerations: []
-
-## Pod scheduling constraints
-## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
-affinity: {}
-
-## Monitoring
-## JMX Settings
-## ref: https://docs.confluent.io/current/ksql/docs/operations.html
-jmx:
-  port: 5555
-
-## Prometheus Exporter Configuration
-## ref: https://prometheus.io/docs/instrumenting/exporters/
-prometheus:
-  ## JMX Exporter Configuration
-  ## ref: https://github.com/prometheus/jmx_exporter
-  jmx:
-    enabled: true
-    image: solsson/kafka-prometheus-jmx-exporter@sha256
-    imageTag: 6f82e2b0464f50da8104acd7363fb9b995001ddff77d248379f8788e78946143
-    imagePullPolicy: IfNotPresent
-    port: 5556
-
-    ## Resources configuration for the JMX exporter container.
-    ## See the `resources` documentation above for details.
-    resources: {}
-
-## External Access
-## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer
-external:
-  enabled: false
-  type: LoadBalancer
-  externalTrafficPolicy: Cluster
-  port: 8088
-
-## Headless mode
-## ref: https://docs.confluent.io/current/ksql/docs/installation/server-config/index.html
-ksql:
-  headless: true
-  queries: ""
-  # For example:
-  # queries: |
-  #   CREATE STREAM pageviews_original (viewtime bigint, userid varchar, pageid varchar)
-  #       WITH (kafka_topic='pageviews', value_format='DELIMITED');
-
-## You can list load balanced service endpoint, or list of all brokers (which is hard in K8s).  e.g.:
-## bootstrapServers: "PLAINTEXT://dozing-prawn-kafka-headless:9092"
-kafka:
-  bootstrapServers: ""
-
-## e.g. http://gnoble-panther-cp-schema-registry:8081
-cp-schema-registry:
-  url: ""
-
 # KSQL configuration options
 ## ref: https://docs.confluent.io/current/ksql/docs/installation/server-config/config-reference.html
 configurationOverrides:
diff --git a/etc/radar-jdbc-connector-agg/values.yaml b/etc/radar-jdbc-connector-agg/values.yaml
index 7b8998013..672e5d2d3 100644
--- a/etc/radar-jdbc-connector-agg/values.yaml
+++ b/etc/radar-jdbc-connector-agg/values.yaml
@@ -26,6 +26,6 @@ sink:
       - USERID
       - PROJECTID
   # -- Comma-separated list of topics the connector will read from and ingest into the database
-  topics: PUSH_GARMIN_HEART_RATE_SAMPLE_TIMESTAMP_LONG_WINDOWED_1H_TABLE,PUSH_GARMIN_PULSE_OX_TIMESTAMP_LONG_WINDOWED_1H_TABLE,PUSH_GARMIN_BODY_BATTERY_TIMESTAMP_LONG_WINDOWED_1H_TABLE,QUESTIONNAIRE_CAT_SCORE_STREAM,QUESTIONNAIRE_PULSE_OX_SCORE_STREAM,QUESTIONNAIRE_VAS_SCORE_STREAM,QUESTIONNAIRE_LIPF_SCORE_STREAM,QUESTIONNAIRE_RALPMH_COVID_SYMPTOMS_SCORE_STREAM,QUESTIONNAIRE_ERS_SCORE_STREAM,PUSH_GARMIN_RESPIRATION_TIMESTAMP_LONG_WINDOWED_1H_TABLE,PUSH_GARMIN_STRESS_LEVEL_TIMESTAMP_LONG_WINDOWED_1H_TABLE,REST_API_INFERENCE_LSTM_COPD,QUESTIONNAIRE_EXACERBATION_DIARY_SCORE_STREAM,QUESTIONNAIRE_ERS_SCORE_UPDATED_STREAM
+  topics: PUSH_GARMIN_HEART_RATE_SAMPLE_TIMESTAMP_LONG_WINDOWED_1H_TABLE
   # -- How to format a table name based on the inserted topic
   tableNameFormat: "${topic}"