diff --git a/apps/__tests__/apps.test.ts b/apps/__tests__/apps.test.ts
index 5df86685..98e154a7 100644
--- a/apps/__tests__/apps.test.ts
+++ b/apps/__tests__/apps.test.ts
@@ -32,6 +32,7 @@ const networkExceptions = [
   "zerotier",
   "gladys",
   "scrypted",
+  "homebridge",
 ];
 const getAppConfigs = (): AppConfig[] => {
   const apps: AppConfig[] = [];
diff --git a/apps/homebridge/config.json b/apps/homebridge/config.json
new file mode 100644
index 00000000..428cee6d
--- /dev/null
+++ b/apps/homebridge/config.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../schema.json",
+  "name": "Home Bridge",
+  "available": true,
+  "port": 8581,
+  "tipi_version": 1,
+  "version": "latest",
+  "id": "homebridge",
+  "categories": ["automation"],
+  "description": "HomeKit support for the impatient.",
+  "short_desc": "HomeKit support for the impatient.  ",
+  "author": "ArneNaessens",
+  "source": "https://github.com/homebridge/homebridge",
+  "form_fields": []
+}
diff --git a/apps/homebridge/docker-compose.yml b/apps/homebridge/docker-compose.yml
new file mode 100644
index 00000000..94a8ed84
--- /dev/null
+++ b/apps/homebridge/docker-compose.yml
@@ -0,0 +1,18 @@
+
+version: '3'
+services:
+  homebridge:
+    container_name: homebridge
+    image: homebridge/homebridge:latest
+    restart: unless-stopped
+    privileged: true
+    network_mode: host
+    environment:
+      - TZ=${TZ}
+    volumes:
+      - ${APP_DATA_DIR}/data/homebridge:/homebridge
+    logging:
+      driver: json-file
+      options:
+        max-size: "10mb"
+        max-file: "1"
\ No newline at end of file
diff --git a/apps/homebridge/metadata/description.md b/apps/homebridge/metadata/description.md
new file mode 100644
index 00000000..4218d00a
--- /dev/null
+++ b/apps/homebridge/metadata/description.md
@@ -0,0 +1,26 @@
+# Homebridge
+
+
+**Homebridge** is a lightweight NodeJS server you can run on your home network that emulates the iOS HomeKit API. It supports Plugins, which are community-contributed modules that provide a basic bridge from HomeKit to various 3rd-party APIs provided by manufacturers of "smart home" devices.
+
+Since Siri supports devices added through HomeKit, this means that with Homebridge you can ask Siri to control devices that don't have any support for HomeKit at all. For instance, using just some of the available plugins, you can say:
+
+-   _Siri, unlock the back door._ \[pictured to the right\]
+-   _Siri, open the garage door._
+-   _Siri, turn on the coffee maker._
+-   _Siri, turn on the living room lights._
+-   _Siri, good morning!_
+
+You can explore all available plugins at the NPM website by [searching for the keyword `homebridge-plugin`](https://www.npmjs.com/search?q=homebridge-plugin).
+
+ [![Unlocking Door](https://camo.githubusercontent.com/3819e14828a6da301c593bd73684d070b7d1bd8f9e483f67bd6c26319812f167/68747470733a2f2f6d656469612e67697068792e636f6d2f6d656469612f31306c373949436f6854753469512f67697068792e676966)](https://camo.githubusercontent.com/3819e14828a6da301c593bd73684d070b7d1bd8f9e483f67bd6c26319812f167/68747470733a2f2f6d656469612e67697068792e636f6d2f6d656469612f31306c373949436f6854753469512f67697068792e676966) [![Unlocking Door](https://camo.githubusercontent.com/3819e14828a6da301c593bd73684d070b7d1bd8f9e483f67bd6c26319812f167/68747470733a2f2f6d656469612e67697068792e636f6d2f6d656469612f31306c373949436f6854753469512f67697068792e676966)
+
+](https://camo.githubusercontent.com/3819e14828a6da301c593bd73684d070b7d1bd8f9e483f67bd6c26319812f167/68747470733a2f2f6d656469612e67697068792e636f6d2f6d656469612f31306c373949436f6854753469512f67697068792e676966)[](https://camo.githubusercontent.com/3819e14828a6da301c593bd73684d070b7d1bd8f9e483f67bd6c26319812f167/68747470733a2f2f6d656469612e67697068792e636f6d2f6d656469612f31306c373949436f6854753469512f67697068792e676966)
+
+## [](https://github.com/homebridge/homebridge#community)Community
+
+The official Homebridge Discord server and Reddit community are where users can discuss Homebridge and ask for help.
+
+ [![Homebridge Discord](https://camo.githubusercontent.com/11240ac552626b069352ce3b64e2502aff52aa97481699fc281dfa678eb141ca/68747470733a2f2f646973636f72646170702e636f6d2f6170692f6775696c64732f3433323636333333303238313232363237302f7769646765742e706e673f7374796c653d62616e6e657232)](https://discord.gg/kqNCe2D) [![Homebridge Reddit](https://github.com/homebridge/homebridge/raw/master/.github/homebridge-reddit.svg?sanitize=true)](https://www.reddit.com/r/homebridge/)
+
+HomeKit communities can also be found on both [Discord](https://discord.gg/RcV7fa8) and [Reddit](https://www.reddit.com/r/homekit).
\ No newline at end of file
diff --git a/apps/homebridge/metadata/logo.jpg b/apps/homebridge/metadata/logo.jpg
new file mode 100644
index 00000000..dfe0acf1
Binary files /dev/null and b/apps/homebridge/metadata/logo.jpg differ