diff --git a/README.md b/README.md
index d00f7bfc..f27a3a4b 100644
--- a/README.md
+++ b/README.md
@@ -194,6 +194,19 @@ Flow-based programming for the Internet of Things
 
 [:books: Node-RED add-on documentation][addon-doc-node-red]
 
+### ✓ [Octobox][addon-octobox]
+
+![Latest Version][octobox-version-shield]
+![Supports armhf Architecture][octobox-armhf-shield]
+![Supports aarch64 Architecture][octobox-aarch64-shield]
+![Supports amd64 Architecture][octobox-amd64-shield]
+![Supports i386 Architecture][octobox-i386-shield]
+![Docker Pulls][octobox-pulls-shield]
+
+Take back control of your GitHub notifications
+
+[:books: Octobox add-on documentation][addon-doc-octobox]
+
 ### ✓ [Pi-hole][addon-pi-hole]
 
 ![Latest Version][pi-hole-version-shield]
@@ -338,6 +351,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: IDE][ide-issue]
 - [Open an issue for the add-on: InfluxDB][influxdb-issue]
 - [Open an issue for the add-on: Node-RED][node-red-issue]
+- [Open an issue for the add-on: Octobox][octobox-issue]
 - [Open an issue for the add-on: Pi-hole][pi-hole-issue]
 - [Open an issue for the add-on: Plex Media Server][plex-issue]
 - [Open an issue for the add-on: SSH - Secure Shell][ssh-issue]
@@ -503,6 +517,15 @@ SOFTWARE.
 [node-red-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [node-red-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [node-red-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-octobox]: https://github.com/hassio-addons/addon-octobox/tree/v0.1.0
+[addon-doc-octobox]: https://github.com/hassio-addons/addon-octobox/blob/v0.1.0/README.md
+[octobox-issue]: https://github.com/hassio-addons/addon-octobox/issues
+[octobox-version-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[octobox-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/octobox.svg
+[octobox-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[octobox-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[octobox-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[octobox-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/tree/v1.2.0
 [addon-doc-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/blob/v1.2.0/README.md
 [pi-hole-issue]: https://github.com/hassio-addons/addon-pi-hole/issues
diff --git a/octobox/CHANGELOG.md b/octobox/CHANGELOG.md
new file mode 100644
index 00000000..7332d310
--- /dev/null
+++ b/octobox/CHANGELOG.md
@@ -0,0 +1 @@
+:tada: Initial release!
\ No newline at end of file
diff --git a/octobox/README.md b/octobox/README.md
new file mode 100644
index 00000000..45c0bcda
--- /dev/null
+++ b/octobox/README.md
@@ -0,0 +1,56 @@
+# Community Hass.io Add-ons: Octobox
+
+[![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
+
+[![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
+
+[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
+
+Take back control of your GitHub notifications.
+
+## About
+
+If you manage more than one active project on GitHub, you probably find GitHub notifications pretty lacking.
+
+Notifications are marked as read and disappear from the list as soon as you load the page or view the email of the notification. This makes it very hard to keep on top of which notifications you still need to follow up on.
+
+Most open source maintainers and GitHub staff end up using a complex combination of filters and labels in Gmail to manage their notifications from their inbox. If you are like me, try to avoid email, then you might want something else.
+Octobox is a beautiful application that manages your GitHub notifications via GitHub’s API, allowing you to filter down by organization, project, notification type, or the reason why you are receiving the notification in the first place.
+
+It is easy to drill down into the issues that matter to you in the current moment while still allowing you to be subscribed to projects that you’d like to keep an eye on. You can quickly address threads that you’ve authored yourself or remember that you still need to submit your review that someone requested.
+You can “star” long-running issues that you know might be important down the road.
+
+A real must-have for every GitHub opensource contributor.
+
+[Click here for the full documentation][docs]
+
+![Home Assistant Control Panel screenshot][screenshot]
+
+## WARNING! THIS IS A BETA VERSION!
+
+This Hass.io Add-ons repository contains beta releases of add-ons.
+
+- They might stop working at any time.
+- They could have a negative impact on your system.
+
+This repository was created for:
+
+- Anybody willing to test.
+- Anybody interested in trying out upcoming add-ons or add-on features.
+
+If you are more interested in stable releases of our add-ons:
+
+<https://github.com/hassio-addons/repository>
+
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/frenck
+[discord-shield]: https://img.shields.io/discord/330944238910963714.svg
+[discord]: https://discord.gg/c5DvZ4e
+[docs]: https://github.com/hassio-addons/addon-octobox/blob/v0.1.0/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-octobox/57695?u=frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
+[release-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-octobox/tree/v0.1.0
+[screenshot]: https://github.com/hassio-addons/addon-octobox/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/octobox/config.json b/octobox/config.json
new file mode 100644
index 00000000..743f4a95
--- /dev/null
+++ b/octobox/config.json
@@ -0,0 +1,65 @@
+{
+  "name": "Octobox",
+  "version": "0.1.0",
+  "slug": "octobox",
+  "description": "Take back control of your GitHub notifications",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-octobox/57695?u=frenck",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:3333]",
+  "startup": "services",
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "i386"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "homeassistant_api": false,
+  "host_network": false,
+  "ports": {
+    "3333/tcp": 3333
+  },
+  "map": [
+    "ssl"
+  ],
+  "options": {
+    "log_level": "info",
+    "github_client_id": "",
+    "github_client_secret": "",
+    "username": "",
+    "password": "",
+    "ssl": false,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "sync_timeout": 600,
+    "fetch_subject": true,
+    "minimum_refresh_interval": 1,
+    "allow_personal_access_token": false,
+    "github_restrict_access": false,
+    "github_organization_id": 0,
+    "github_team_id": 0,
+    "ipv6": false
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "github_client_id": "str",
+    "github_client_secret": "str",
+    "username": "str",
+    "password": "str",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "sync_timeout": "int",
+    "fetch_subject": "bool",
+    "minimum_refresh_interval": "int",
+    "allow_personal_access_token": "bool",
+    "github_restrict_access": "bool",
+    "github_organization_id": "int",
+    "github_team_id": "int",
+    "ipv6": "bool"
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
+  },
+  "image": "hassioaddons/octobox"
+}
\ No newline at end of file
diff --git a/octobox/icon.png b/octobox/icon.png
new file mode 100644
index 00000000..b18936ee
Binary files /dev/null and b/octobox/icon.png differ
diff --git a/octobox/logo.png b/octobox/logo.png
new file mode 100644
index 00000000..67bdc58b
Binary files /dev/null and b/octobox/logo.png differ