diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bf6d77..c29f366 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,16 @@ For releases `< 1.0.0` minor version step indicate breaking changes.
 
 ## [Unreleased] - YYYY-MM-DD
 
+## [tum-gis-iot-stack-k8s-0.9.9] - 2023-05-09
+
+### Changed
+
+- Some FROST-Server default settings
+
+### Fixed
+
+- FROST-Server `defaultCount` not set due to missing variable in template
+
 ## [tum-gis-iot-stack-k8s-0.9.8] - 2023-05-08
 
 ### Added
@@ -117,6 +127,7 @@ For releases `< 1.0.0` minor version step indicate breaking changes.
 ### Deprecated
 
 [Unreleased]: https://github.com/tum-gis/tum-gis-iot-stack-k8s/compare/tum-gis-iot-stack-k8s-0.9.8...HEAD
+[tum-gis-iot-stack-k8s-0.9.9]: https://github.com/tum-gis/tum-gis-iot-stack-k8s/compare/tum-gis-iot-stack-k8s-0.9.8...tum-gis-iot-stack-k8s-0.9.9
 [tum-gis-iot-stack-k8s-0.9.8]: https://github.com/tum-gis/tum-gis-iot-stack-k8s/compare/tum-gis-iot-stack-k8s-0.9.7...tum-gis-iot-stack-k8s-0.9.8
 [tum-gis-iot-stack-k8s-0.9.7]: https://github.com/tum-gis/tum-gis-iot-stack-k8s/compare/tum-gis-iot-stack-k8s-0.9.6...tum-gis-iot-stack-k8s-0.9.7
 [tum-gis-iot-stack-k8s-0.9.6]: https://github.com/tum-gis/tum-gis-iot-stack-k8s/compare/tum-gis-iot-stack-k8s-0.9.5...tum-gis-iot-stack-k8s-0.9.6
diff --git a/charts/tum-gis-iot-stack-k8s/Chart.yaml b/charts/tum-gis-iot-stack-k8s/Chart.yaml
index 17fe192..28b9a1f 100644
--- a/charts/tum-gis-iot-stack-k8s/Chart.yaml
+++ b/charts/tum-gis-iot-stack-k8s/Chart.yaml
@@ -15,7 +15,7 @@ maintainers:
     name: Bruno Willenborg
     url: https://www.asg.ed.tum.de/en/gis/our-team/staff/bruno-willenborg/
 
-version: 0.9.8
+version: 0.9.9
 appVersion: "2.1.2"
 
 dependencies:
diff --git a/charts/tum-gis-iot-stack-k8s/charts/frostweb/Chart.yaml b/charts/tum-gis-iot-stack-k8s/charts/frostweb/Chart.yaml
index b9bceca..4facb8e 100644
--- a/charts/tum-gis-iot-stack-k8s/charts/frostweb/Chart.yaml
+++ b/charts/tum-gis-iot-stack-k8s/charts/frostweb/Chart.yaml
@@ -9,7 +9,7 @@ sources:
   - https://github.com/FraunhoferIOSB/FROST-Server
 
 
-version: 0.6.2
+version: 0.6.3
 appVersion: "2.1.2"
 
 maintainers:
diff --git a/charts/tum-gis-iot-stack-k8s/charts/frostweb/templates/frost-http-mqtt-configMap.yml b/charts/tum-gis-iot-stack-k8s/charts/frostweb/templates/frost-http-mqtt-configMap.yml
index e58e185..d92bfac 100644
--- a/charts/tum-gis-iot-stack-k8s/charts/frostweb/templates/frost-http-mqtt-configMap.yml
+++ b/charts/tum-gis-iot-stack-k8s/charts/frostweb/templates/frost-http-mqtt-configMap.yml
@@ -19,6 +19,8 @@ data:
   maxTop: {{ .Values.maxTop | quote }}
   defaultTop: {{ .Values.defaultTop | quote }}
   maxDataSize: {{ .Values.maxDataSize | quote }}
+  defaultCount: {{ .Values.defaultCount | quote }}
+  logSensitiveData: {{ .Values.logSensitiveData | quote }}
 
   # Persistence settings
   persistence_db_driver: {{ .Values.persistence.db.driver | quote }}
diff --git a/charts/tum-gis-iot-stack-k8s/charts/frostweb/values.yaml b/charts/tum-gis-iot-stack-k8s/charts/frostweb/values.yaml
index e734b7f..5a1f992 100644
--- a/charts/tum-gis-iot-stack-k8s/charts/frostweb/values.yaml
+++ b/charts/tum-gis-iot-stack-k8s/charts/frostweb/values.yaml
@@ -106,16 +106,17 @@ persistence:
   queryTimeout: 0
   countMode: "LIMIT_SAMPLE"
   countEstimateThreshold: 10000
-  idGenerationMode: ServerAndClientGenerated
+  idGenerationMode: ServerGeneratedOnly
   slowQueryThreshold: 200
 
 # FROST-Server General settings
 # https://fraunhoferiosb.github.io/FROST-Server/settings/settings.html#general-settings
-alwaysOrderbyId: true
+alwaysOrderbyId: false
 maxTop: 10000
 defaultTop: 100
 defaultCount: false
 maxDataSize: "25000000"
+logSensitiveData: false
 
 # FROST-Server MQTT settings
 # https://fraunhoferiosb.github.io/FROST-Server/settings/settings.html#mqtt-settings