diff --git a/homematic/CHANGELOG.md b/homematic/CHANGELOG.md
index 61665cb..17eaaf6 100644
--- a/homematic/CHANGELOG.md
+++ b/homematic/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 9.6
+
+- Update OCCU to 3.49.17-4
+- Use new gcc8 binary for i386
+- Change ReGaHass to normal version
+
 ## 9.5
 
 - Fix ReGaHss binary
diff --git a/homematic/Dockerfile b/homematic/Dockerfile
index de6ab8f..a6b78e3 100644
--- a/homematic/Dockerfile
+++ b/homematic/Dockerfile
@@ -36,7 +36,7 @@ RUN curl -SL https://github.com/jens-maus/occu/archive/${OCCU_VERSION}.tar.gz |
         then \
             cd arm-gnueabihf-gcc8; \
         else \
-            cd X86_32_Debian_Wheezy; \
+            cd X86_32_GCC8; \
         fi \
     \
     && cp -R packages-eQ-3/RFD/bin /opt/hm/ \
@@ -45,21 +45,24 @@ RUN curl -SL https://github.com/jens-maus/occu/archive/${OCCU_VERSION}.tar.gz |
     && cp -R packages-eQ-3/LinuxBasis/lib /opt/hm/ \
     && cp -R packages-eQ-3/HS485D/bin /opt/hm/ \
     && cp -R packages-eQ-3/HS485D/lib /opt/hm/ \
+    \
     && cp -R packages-eQ-3/WebUI/bin /opt/hm/ \
     && cp -R packages-eQ-3/WebUI/lib /opt/hm/ \
     && rm -rf packages-eQ-3/WebUI/etc/config* packages-eQ-3/WebUI/ect/rega.conf \
-    && mv /opt/hm/bin/ReGaHss.community /opt/hm/bin/ReGaHss \
+    && mv /opt/hm/bin/ReGaHss.normal /opt/hm/bin/ReGaHss \
+    && rm -f /opt/hm/bin/ReGaHss.* \
     && cp -R packages-eQ-3/WebUI/etc/* /opt/hm/etc/ \
-    && rm -f packages/lighttpd/etc/lighttpd/lighttpd_ssl.conf \
     && cp -R packages/lighttpd/etc/lighttpd /opt/hm/etc/ \
-    && cd ../ \
+    && sed -i "s|/etc/lighttpd/||" /opt/hm/etc/lighttpd/conf.d/proxy.conf \
     \
+    && cd ../ \
     && cp -r firmware / \
     && cp -R HMserver/opt/HmIP/* /opt/HmIP/ \
     && cp -a HMserver/opt/HMServer/*.jar /opt/HMServer/ \
     && cp -R HMserver/opt/HMServer/groups /opt/HMServer/ \
     && cp -R HMserver/opt/HMServer/measurement /opt/HMServer/ \
     && cp -R HMserver/opt/HMServer/pages /opt/HMServer/ \
+    \
     && sed -i "s/WEBUI_VERSION = \".*\"/WEBUI_VERSION = \"${OCCU_VERSION}\"/" WebUI/www/rega/pages/index.htm \
     && cp -R WebUI/* / \
     && ln -s /www /opt/hm/www \
diff --git a/homematic/build.json b/homematic/build.json
index 4ef8742..a138dce 100644
--- a/homematic/build.json
+++ b/homematic/build.json
@@ -4,6 +4,6 @@
     "i386": "homeassistant/i386-base-debian:buster"
   },
   "args": {
-    "OCCU_VERSION": "3.49.17-2"
+    "OCCU_VERSION": "3.49.17-4"
   }
 }
diff --git a/homematic/config.json b/homematic/config.json
index 735a94d..be4e60d 100644
--- a/homematic/config.json
+++ b/homematic/config.json
@@ -1,6 +1,6 @@
 {
   "name": "HomeMatic CCU",
-  "version": "9.5",
+  "version": "9.6",
   "slug": "homematic",
   "description": "HomeMatic central based on OCCU",
   "url": "hhttps://github.com/home-assistant/hassio-addons/tree/master/homematic",
diff --git a/homematic/data/run.sh b/homematic/data/run.sh
index 36925e4..5efd548 100755
--- a/homematic/data/run.sh
+++ b/homematic/data/run.sh
@@ -18,6 +18,7 @@ ln -s /data/userprofiles /etc/config/userprofiles
 touch /data/hmip_user.conf
 touch /data/rega_user.conf
 touch /data/homematic.regadom
+touch /data/userprofiles/userAckInstallWizard_Admin
 
 # Import helpers
 . /usr/lib/hm-firmware.sh
@@ -146,6 +147,7 @@ sleep 30
 WAIT_PIDS+=($!)
 
 # Start WebInterface
+openssl req -new -x509 -nodes -keyout /etc/config/server.pem -out /etc/config/server.pem -days 3650 -subj "/C=DE/O=HomeMatic/OU=Hass.io/CN=$(hostname)"
 lighttpd-angel -D -f /opt/hm/etc/lighttpd/lighttpd.conf &
 WAIT_PIDS+=($!)