diff --git a/apps/homeassistant-1/metadata/description.md b/apps/homeassistant-1/metadata/description.md
index 2e98683f..f12abd90 100644
--- a/apps/homeassistant-1/metadata/description.md
+++ b/apps/homeassistant-1/metadata/description.md
@@ -4,6 +4,8 @@ Open source home automation that puts local control and privacy first. Powered b
 
 Check out [home-assistant.io](https://home-assistant.io) for a [demo](https://home-assistant.io/demo/), installation [instructions](https://home-assistant.io/getting-started/), [tutorials](https://home-assistant.io/getting-started/automation/) and [documentation](https://home-assistant.io/docs/)
 
+**HomeKit Support in Docker:** Use MDNS app ! (And follow https://community.home-assistant.io/t/using-homekit-component-inside-docker/45409/41)
+
 ## Migration
 
 February 2024
diff --git a/apps/mdns-repeater/config.json b/apps/mdns-repeater/config.json
new file mode 100644
index 00000000..52b53110
--- /dev/null
+++ b/apps/mdns-repeater/config.json
@@ -0,0 +1,39 @@
+{
+  "$schema": "../schema.json",
+  "name": "MDNS Repeater",
+  "available": true,
+  "exposable": false,
+  "no_gui": true,
+  "port": 9998,
+  "id": "mdns-repeater",
+  "tipi_version": 1,
+  "version": "latest",
+  "categories": [
+    "utilities",
+    "automation"
+  ],
+  "author": "angelnu",
+  "description": "This program re-broadcast mDNS packets from one interface to other interfaces.",
+  "short_desc": "Re-broadcast mDNS packets.",
+  "source": "https://github.com/angelnu/docker-mdns_repeater",
+  "form_fields": [
+    {
+      "type": "text",
+      "label": "MDNS > hostNIC (FROM network)",
+      "required": true,
+      "placeholder": "eth0",
+      "env_variable": "MDNS_HOST_NIC"
+    },
+    {
+      "type": "text",
+      "label": "MDNS > dockerNIC (TO network)",
+      "required": true,
+      "placeholder": "br-5813ba86106f",
+      "env_variable": "MDNS_DOCKER_NIC"
+    }
+  ],
+  "supported_architectures": [
+    "arm64",
+    "amd64"
+  ]
+}
\ No newline at end of file
diff --git a/apps/mdns-repeater/docker-compose.yml b/apps/mdns-repeater/docker-compose.yml
new file mode 100644
index 00000000..2828b6ab
--- /dev/null
+++ b/apps/mdns-repeater/docker-compose.yml
@@ -0,0 +1,14 @@
+services:
+  mdns-repeater:
+    image: angelnu/mdns_repeater:latest
+    container_name: mdns-repeater
+    restart: unless-stopped
+    network_mode: host
+    environment:
+    - hostNIC=${MDNS_HOST_NIC}
+    - dockerNIC=${MDNS_DOCKER_NIC}
+    networks:
+      - tipi_main_network
+    labels:
+      # Main
+      traefik.enable: false
\ No newline at end of file
diff --git a/apps/mdns-repeater/metadata/description.md b/apps/mdns-repeater/metadata/description.md
new file mode 100644
index 00000000..1e26fb67
--- /dev/null
+++ b/apps/mdns-repeater/metadata/description.md
@@ -0,0 +1,10 @@
+# Multicast DNS Repeater
+
+Allow docker containers in virtual networks to send/receive mdns broadcast messages
+
+More at: https://iotespresso.com/a-beginners-guide-to-mdns-and-dns-sd/
+
+## HomeKit support for Home Assistant
+
+Add a container that repeats mDNS traffic from one network interface to another network interface
+Cf. https://community.home-assistant.io/t/using-homekit-component-inside-docker/45409/41
\ No newline at end of file
diff --git a/apps/mdns-repeater/metadata/logo.jpg b/apps/mdns-repeater/metadata/logo.jpg
new file mode 100644
index 00000000..316a45b7
Binary files /dev/null and b/apps/mdns-repeater/metadata/logo.jpg differ