diff --git a/helm/raspberrymatic/Chart.yaml b/helm/raspberrymatic/Chart.yaml
index 6855adbcfd..4c4fbcd245 100644
--- a/helm/raspberrymatic/Chart.yaml
+++ b/helm/raspberrymatic/Chart.yaml
@@ -29,15 +29,15 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 3.63.8
+version: 3.63.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 3.63.8.20220330
+appVersion: 3.63.9.20220430
 
 annotations:
   artifacthub.io/changes: |
-    - Release of 3.63.8.20220330 (https://github.com/jens-maus/RaspberryMatic/releases/tag/3.63.8.20220330)
+    - Release of 3.63.9.20220430 (https://github.com/jens-maus/RaspberryMatic/releases/tag/3.63.9.20220430)
   artifacthub.io/license: Apache-2.0
   artifacthub.io/links: |
     - name: Webpage
diff --git a/home-assistant-addon/config.yaml b/home-assistant-addon/config.yaml
index 848d2e60cd..3183765794 100644
--- a/home-assistant-addon/config.yaml
+++ b/home-assistant-addon/config.yaml
@@ -1,6 +1,6 @@
 ---
 name: RaspberryMatic CCU
-version: 3.63.8.20220330
+version: 3.63.9.20220430
 slug: raspberrymatic
 image: ghcr.io/jens-maus/raspberrymatic
 arch:
diff --git a/release/LATEST-VERSION.js b/release/LATEST-VERSION.js
index ea84fc981a..067bca3702 100644
--- a/release/LATEST-VERSION.js
+++ b/release/LATEST-VERSION.js
@@ -1 +1 @@
-homematic.com.setLatestVersion('3.63.8.20220330', 'HM-RASPBERRYMATIC');
+homematic.com.setLatestVersion('3.63.9.20220430', 'HM-RASPBERRYMATIC');
diff --git a/release/rpi-imager.json b/release/rpi-imager.json
index bc039c1ac7..f921c1c8b2 100644
--- a/release/rpi-imager.json
+++ b/release/rpi-imager.json
@@ -1,51 +1,51 @@
 {
   "os_list": [
     {
-      "name": "RaspberryMatic 3.63.8.20220330 (RPi4, RPi400)",
+      "name": "RaspberryMatic 3.63.9.20220430 (RPi4, RPi400)",
       "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",
-      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/3.63.8.20220330/RaspberryMatic-3.63.8.20220330-rpi4.zip",
+      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/3.63.9.20220430/RaspberryMatic-3.63.9.20220430-rpi4.zip",
       "icon": "https://raw.githubusercontent.com/jens-maus/RaspberryMatic/master/release/rpi-imager.png",
-      "release_date": "2022-03-30",
+      "release_date": "2022-04-30",
       "extract_size": 1345249792,
-      "extract_sha256": "2d624c6021e458ef8258eca32b3bb4a7c7968716cf4900160bb8a26344c762fd",
-      "image_download_size": 284995887,
-      "image_download_sha256": "cec563f530f9e151852c461ebd8a4e754a31f4d86ebc1b21b02f7f94b25b7bde",
+      "extract_sha256": "e451bde777aad72ae7dad7b6ec09d6337b46cbd14123c32ec6dcc32d49ce8e9b",
+      "image_download_size": 288573921,
+      "image_download_sha256": "d43ba267beeff7cd838f926d705c3b3440436066f5d1da52c79febc7cdcb805a",
       "website": "https://raspberrymatic.de/"
     },
     {
-      "name": "RaspberryMatic 3.63.8.20220330 (RPi3, RPiZero2, ELV-Charly, CCU3)",
+      "name": "RaspberryMatic 3.63.9.20220430 (RPi3, RPiZero2, ELV-Charly, CCU3)",
       "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",
-      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/3.63.8.20220330/RaspberryMatic-3.63.8.20220330-rpi3.zip",
+      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/3.63.9.20220430/RaspberryMatic-3.63.9.20220430-rpi3.zip",
       "icon": "https://raw.githubusercontent.com/jens-maus/RaspberryMatic/master/release/rpi-imager.png",
-      "release_date": "2022-03-30",
+      "release_date": "2022-04-30",
       "extract_size": 1345249792,
-      "extract_sha256": "de05457e76a6b0c0189184539f1380875f26bd2c33c34d1a473fac1a4d0131fa",
-      "image_download_size": 281574774,
-      "image_download_sha256": "e3caa374df2052f5632528f5d5409cdcda35cbe2710981b236e8dce1919e3807",
+      "extract_sha256": "be06e78e227351fa9f84c5d8deaf7998a3a319a8c312460e587f36396c335109",
+      "image_download_size": 282615958,
+      "image_download_sha256": "7b7dc00a9179fce47ff2f41a0565948bc61ff2dc906c98b17cbbdd0b7967b135",
       "website": "https://raspberrymatic.de/"
     },
     {
-      "name": "RaspberryMatic 3.63.8.20220330 (RPi2)",
+      "name": "RaspberryMatic 3.63.9.20220430 (RPi2)",
       "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",
-      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/3.63.8.20220330/RaspberryMatic-3.63.8.20220330-rpi2.zip",
+      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/3.63.9.20220430/RaspberryMatic-3.63.9.20220430-rpi2.zip",
       "icon": "https://raw.githubusercontent.com/jens-maus/RaspberryMatic/master/release/rpi-imager.png",
-      "release_date": "2022-03-30",
+      "release_date": "2022-04-30",
       "extract_size": 1345249792,
-      "extract_sha256": "f1dc8e1ccc57959a3940499f43cb72023c00a50590754f4cd129854e563f49ae",
-      "image_download_size": 262308279,
-      "image_download_sha256": "9080b901407dd52978176083ec60cd6e39878aecef76b6000c82dfd74f056154",
+      "extract_sha256": "84d8256b1f28c72a2442c75badf47ddbf26918a1301853182da4678be792d3c0",
+      "image_download_size": 266638776,
+      "image_download_sha256": "cefb9cb0c92cf925953e85e7967118a4b4823eb84a5978beb20eb7331d28835d",
       "website": "https://raspberrymatic.de/"
     },
     {
-      "name": "RaspberryMatic 3.63.8.20220330 (RPiZero, RPi1)",
+      "name": "RaspberryMatic 3.63.9.20220430 (RPiZero, RPi1)",
       "description": "Lightweight Linux OS for running a HomeMatic/homematicIP IoT central.",
-      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/3.63.8.20220330/RaspberryMatic-3.63.8.20220330-rpi0.zip",
+      "url": "https://github.com/jens-maus/RaspberryMatic/releases/download/3.63.9.20220430/RaspberryMatic-3.63.9.20220430-rpi0.zip",
       "icon": "https://raw.githubusercontent.com/jens-maus/RaspberryMatic/master/release/rpi-imager.png",
-      "release_date": "2022-03-30",
+      "release_date": "2022-04-30",
       "extract_size": 1345249792,
-      "extract_sha256": "41db455b65a0100a29dbf578d3a83155f205abc4470217cdb77583c2bcca036f",
-      "image_download_size": 265147036,
-      "image_download_sha256": "8561246f3d81edd2de8a39a6f7824e529982dc317b72b20646a7aab7b3146cee",
+      "extract_sha256": "6b5eb88e602a5ce3cd3132c4c47ef79fe04f108c0115e7ec8ca3bb29c84c2a9f",
+      "image_download_size": 266245352,
+      "image_download_sha256": "4ba5d467bfd1efb61bb758b1a2c8e4bfc157d59d5a6264a1c6176496db381807",
       "website": "https://raspberrymatic.de/"
     },
     {