diff --git a/intern/docker_homeassistant/templates/config/configuration.yaml b/intern/docker_homeassistant/templates/config/configuration.yaml
index 8b3fe2c99971aeaceb5e368ac2f182895636543d..47b826aade369d1a3c3b66bf45e6d10741583a60 100644
--- a/intern/docker_homeassistant/templates/config/configuration.yaml
+++ b/intern/docker_homeassistant/templates/config/configuration.yaml
@@ -54,6 +54,33 @@ influxdb:
   token: {{ influxdb_token }}
   default_measurement: units
 
+# Homematic CCU2
+# https://www.home-assistant.io/integrations/homematic/
+homematic:
+  local_port: {{ homematic_callback_port }}
+  interfaces:
+    rf:
+      host: 192.168.0.15
+      resolvenames: json
+      callback_ip: {{ int_ip4 }}
+      callback_port: {{ homematic_callback_port }}
+    ip:
+      host: 192.168.0.15
+      port: 2010
+      callback_ip: {{ int_ip4 }}
+      callback_port: {{ homematic_callback_port }}
+    groups:
+      host: 192.168.0.15
+      port: 9292
+      resolvenames: json
+      path: /groups
+      callback_ip: {{ int_ip4 }}
+      callback_port: {{ homematic_callback_port }}
+  hosts:
+    ccu2:
+      host: 192.168.0.15
+
+
 # zonenstatus wird vom hauptschalter gesteuert, switch02 ping ist nicht mehr notwendig
 # https://www.home-assistant.io/integrations/ping/
 #binary_sensor:
diff --git a/intern/docker_homeassistant/templates/docker-compose.yml b/intern/docker_homeassistant/templates/docker-compose.yml
index 1a63ce4e6b3d245765593172fc41d89b03db5f68..979b285c2706533bcc7d71b50eb106eb0813e454 100644
--- a/intern/docker_homeassistant/templates/docker-compose.yml
+++ b/intern/docker_homeassistant/templates/docker-compose.yml
@@ -7,6 +7,8 @@ services:
 
     image: homeassistant/home-assistant:2023.3
     restart: always
+    ports:
+      - "{{ int_ip4 }}:{{ homematic_callback_port }}:{{ homematic_callback_port }}"
     volumes:
       - "/etc/localtime:/etc/localtime:ro"
       - "{{ basedir }}/config:/config"
diff --git a/site.yml b/site.yml
index 10363b65fc21b92eacd0ce29898731fb1d4302e5..065db8aa565108bd6f89a02aafc9fc192f26c38b 100644
--- a/site.yml
+++ b/site.yml
@@ -92,7 +92,8 @@
         servicename: homeassistant, 
         basedir: /srv/homeassistant,
         domain: "ha.warpzone.lan",
-        influxdb_port: 38086
+        homematic_callback_port: 8060,
+        influxdb_port: 38086       
       }
     - { 
         role: intern/docker_mqtt, tags: mqtt, 
diff --git a/webserver/docker_icinga/templates/etc/icinga/conf.d/hosts_manual.conf b/webserver/docker_icinga/templates/etc/icinga/conf.d/hosts_manual.conf
index eba63847324e9ea3cee2d5a37f95513721556116..fbac38f79f3657f634b486f48d2ab62a782e180b 100644
--- a/webserver/docker_icinga/templates/etc/icinga/conf.d/hosts_manual.conf
+++ b/webserver/docker_icinga/templates/etc/icinga/conf.d/hosts_manual.conf
@@ -73,3 +73,11 @@ object Host "wz-ap-werkstatt" {
 
   groups = [ "network" ]
 }
+
+object Host "homematic-ccu2" {
+  import "generic-host"
+
+  address = "192.168.0.15"
+
+  groups = [ "network" ]
+}