diff --git a/.hassio-addons.yml b/.hassio-addons.yml
index f76c9b686..eb7aac963 100644
--- a/.hassio-addons.yml
+++ b/.hassio-addons.yml
@@ -93,10 +93,6 @@ addons:
     repository: hassio-addons/addon-portainer
     target: portainer
     image: hassioaddons/portainer
-  shinobi:
-    repository: hassio-addons/addon-shinobi
-    target: shinobi
-    image: hassioaddons/shinobi-{arch}
   spotify:
     repository: hassio-addons/addon-spotify-connect
     target: spotify
diff --git a/shinobi/CHANGELOG.md b/shinobi/CHANGELOG.md
deleted file mode 100644
index 00eb078ba..000000000
--- a/shinobi/CHANGELOG.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Changelog since v0.2.0
-
-2018/09/29 16:53 UTC - [812f79a](https://github.com/hassio-addons/addon-shinobi/commit/812f79ac3f78c95d79a9e612be09317a981c5ab3) by [@frenck](https://github.com/frenck)
-> :hammer: Replaces NPM sqlite with sqlite3 package 
-
-2018/09/29 16:53 UTC - [b15ccb8](https://github.com/hassio-addons/addon-shinobi/commit/b15ccb81f80d1200309e1faa9e6072db8c8c4de6) by [@frenck](https://github.com/frenck)
-> :shirt: Surpress linter warning for sqlite node package 
-
-2018/09/29 16:53 UTC - [e5dd6f9](https://github.com/hassio-addons/addon-shinobi/commit/e5dd6f97280f8cb92523d9da9e89c2cd2f8d1ce4) by [@frenck](https://github.com/frenck)
-> :ambulance: Workaround a SQLite NPM package issue 
-
-2018/09/29 16:53 UTC - [f3287fc](https://github.com/hassio-addons/addon-shinobi/commit/f3287fca157627fc7cd676d5a736311244184db3) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades Shinobi to 7134e06a9ca032f363193063cf8ede8cd6d067cc 
-
-2018/09/29 16:53 UTC - [af48f7a](https://github.com/hassio-addons/addon-shinobi/commit/af48f7aebf7e049e198dba9aa3913e82de7326f5) by [@frenck](https://github.com/frenck)
-> :tractor: Shinobi moved to GitLab 
-
-2018/09/29 16:53 UTC - [59ec6a6](https://github.com/hassio-addons/addon-shinobi/commit/59ec6a6d510e4810dd64ae9f57a081879ac6eb56) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades x265 to 2.7-r1 
-
-2018/09/29 16:53 UTC - [29deb1e](https://github.com/hassio-addons/addon-shinobi/commit/29deb1e1668b453043e9fedaa53625c14b2ed335) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades x264 to 20180304-r1 
-
-2018/09/29 16:53 UTC - [d14bc61](https://github.com/hassio-addons/addon-shinobi/commit/d14bc61c05cb4d86f18ed34ed4a75f44a764791d) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades mysql-client to 10.2.15-r0 
-
-2018/09/29 16:53 UTC - [22cb055](https://github.com/hassio-addons/addon-shinobi/commit/22cb055d07885fa8f23348e1577b5653879a0d83) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades ttf-freefont to 20120503-r1 
-
-2018/09/29 16:53 UTC - [bb894f1](https://github.com/hassio-addons/addon-shinobi/commit/bb894f1f3fd7c02b340da1de43bc7495b72e0d73) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades socat to 1.7.3.2-r4 
-
-2018/09/29 16:53 UTC - [7bc36ec](https://github.com/hassio-addons/addon-shinobi/commit/7bc36ec0922d1c5d9aca383d820e7d8149384de5) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades sqlite to 3.24.0-r0 
-
-2018/09/29 16:53 UTC - [3342efa](https://github.com/hassio-addons/addon-shinobi/commit/3342efa593982c02a0ca7d8fa709eacb96a1ed4c) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades ffmpeg to 3.4.4-r1 
-
-2018/09/29 16:53 UTC - [c6e8112](https://github.com/hassio-addons/addon-shinobi/commit/c6e81123d7943756ad03b05f36cdad776d4a891c) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades nodejs to 8.11.4-r0 
-
-2018/09/29 16:53 UTC - [bb5ac04](https://github.com/hassio-addons/addon-shinobi/commit/bb5ac049d2eb7857cd2e17c87a6c5a4eedb67feb) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades yarn to 1.7.0-r0 
-
-2018/09/29 16:53 UTC - [ed41bc4](https://github.com/hassio-addons/addon-shinobi/commit/ed41bc4d82de081e160b91858f01038f13941a61) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades pkgconf to 1.5.3-r0 
-
-2018/09/29 16:53 UTC - [725f99a](https://github.com/hassio-addons/addon-shinobi/commit/725f99a6fb8e363d9aed06284568f7591f491546) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades Python to 2.7.15-r1 
-
-2018/09/29 16:53 UTC - [e8e0ebe](https://github.com/hassio-addons/addon-shinobi/commit/e8e0ebed97297442ba1d9db53b06577dd8391cb9) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades openssl to 1.0.2p-r0 
-
-2018/09/29 16:53 UTC - [d0923fe](https://github.com/hassio-addons/addon-shinobi/commit/d0923fe6efe263dc5bf1b77bcc611f3146d422fb) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades build-base to 0.5-r1 
-
-2018/09/29 16:53 UTC - [7d29316](https://github.com/hassio-addons/addon-shinobi/commit/7d29316136323affa66583081abe6b820f610135) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades make to 4.2.1-r2 
-
-2018/09/29 16:53 UTC - [708dbfe](https://github.com/hassio-addons/addon-shinobi/commit/708dbfe28bb55182786e82d1c158e75f63735a06) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades GCC/G++ to 6.4.0-r9 
-
-2018/09/29 16:53 UTC - [333bcb3](https://github.com/hassio-addons/addon-shinobi/commit/333bcb3f3fe6f5d09d0eb42e6d5f3c5c6bad5a90) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades git to 2.18.0-r0 
-
-2018/09/29 16:53 UTC - [3412ba9](https://github.com/hassio-addons/addon-shinobi/commit/3412ba9e70ef29f2dfca2b0d5c66febfb4cdc1f2) by [@frenck](https://github.com/frenck)
-> :whale: Sets default Shell 
-
-2018/09/29 16:53 UTC - [5609320](https://github.com/hassio-addons/addon-shinobi/commit/560932048c1388fce09748479eee3008ebfc85c6) by [@frenck](https://github.com/frenck)
-> :snowflake: Adds Hassio API role to configuration 
-
-2018/09/29 16:53 UTC - [37738c0](https://github.com/hassio-addons/addon-shinobi/commit/37738c0f93dcdc5fd323804510a86287352bf09a) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades base image to v2.3.0 
-
-2018/09/29 16:53 UTC - [91d70eb](https://github.com/hassio-addons/addon-shinobi/commit/91d70eb1e1cb72e059a5b6d3212363c6a1313ce0) by [@frenck](https://github.com/frenck)
-> :rocket: GitLab CI now using the latest Hadolint 
-
-2018/09/29 16:53 UTC - [7f1dedf](https://github.com/hassio-addons/addon-shinobi/commit/7f1dedf7867eaab46ce9588957113993ad274f74) by [@ezraholm50](https://github.com/ezraholm50)
-> Copy/paste fix (#6) 
-
-2018/09/29 16:53 UTC - [2df71b8](https://github.com/hassio-addons/addon-shinobi/commit/2df71b814a6052d8a1652917e471df17520b436e) by [@frenck](https://github.com/frenck)
-> :hammer: Switches Shinobi from dev to master 
-
-2018/09/29 16:53 UTC - [80803f7](https://github.com/hassio-addons/addon-shinobi/commit/80803f745387f38180de723270e1afdda9736a38) by [@frenck](https://github.com/frenck)
-> :rocket: Rewrites GitLab CI 
-
-2018/09/29 16:53 UTC - [e9fa795](https://github.com/hassio-addons/addon-shinobi/commit/e9fa79524215e3f1d47c42c7dfc1088857a7876b) by [@frenck](https://github.com/frenck)
-> :arrow_up: Updates Shinobi to 4d00c910f756167e8b04bd4a3795c2ffda3e823c 
-
-2018/09/29 16:53 UTC - [4c08156](https://github.com/hassio-addons/addon-shinobi/commit/4c08156a5398014a9315636405ee116f40e5ab93) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades sqlite3 to 3.21.0-r1 
-
-2018/09/29 16:53 UTC - [739de4d](https://github.com/hassio-addons/addon-shinobi/commit/739de4dd8d7bef104123bc8048e6a0d23103319a) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades git to 2.15.2-r0 
-
-2018/09/29 16:53 UTC - [3e5533c](https://github.com/hassio-addons/addon-shinobi/commit/3e5533c9bfbd77997460440cdfc99e16e3b983d2) by [@frenck](https://github.com/frenck)
-> :arrow_up: Upgrades base image to v1.4.2 
-
-2018/09/29 16:53 UTC - [759a811](https://github.com/hassio-addons/addon-shinobi/commit/759a811762d82708bfa56beecc4fa1d36f0bead9) by [@frenck](https://github.com/frenck)
-> :rocket: Moves build-env to latest 
-
diff --git a/shinobi/README.md b/shinobi/README.md
deleted file mode 100644
index 2914b79d0..000000000
--- a/shinobi/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Community Hass.io Add-ons: Shinobi Pro
-
-[![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]
-
-Beautiful and feature-rich CCTV/NVR for your camera's
-
-## About
-
-Shinobi is Open Source, written in Node.js, and real easy to use. It is the
-future of CCTV and NVR for developers and end-users alike. It is catered to
-by professionals and most importantly by the one who created it.
-
-Shinobi can be used as a Baby Monitor, Construction Site Montage Viewer,
-Store Camera DVR, and much more.
-
-You can use Shinobi Pro for personal use without a license in non-commercial
-locations, for educational, or simple testing. Schools, Colleges,
-and Universities do not require a subscription.
-
-![Terminal in the Home Assistant Frontend][screenshot]
-
-[Click here for the full documentation][docs]
-
-## WARNING! THIS IS AN EDGE VERSION!
-
-This Hass.io Add-ons repository contains edge builds of add-ons. Edge builds
-add-ons are based upon the latest development version.
-
-- They may not work at all.
-- 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.
-- Developers.
-
-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-shinobi/blob/812f79a/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-shinobi-pro/49767?u=frenck
-[hass-ssh]: https://home-assistant.io/addons/ssh/
-[maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
-[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-812f79a-blue.svg
-[release]: https://github.com/hassio-addons/addon-shinobi/tree/812f79a
-[screenshot]: https://github.com/hassio-addons/addon-shinobi/raw/master/images/screenshot.jpg
-
diff --git a/shinobi/config.json b/shinobi/config.json
deleted file mode 100644
index c608fd09a..000000000
--- a/shinobi/config.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "name": "Shinobi Pro",
-  "version": "812f79a",
-  "slug": "shinobi",
-  "description": "Beautiful and feature-rich CCTV/NVR for your cameras",
-  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-shinobi-pro/49767?u=frenck",
-  "webui": "http://[HOST]:[PORT:7440]",
-  "startup": "application",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "i386"
-  ],
-  "boot": "auto",
-  "hassio_api": true,
-  "hassio_role": "default",
-  "homeassistant_api": false,
-  "host_network": false,
-  "ports": {
-    "80/tcp": 7440,
-    "443/tcp": 7443
-  },
-  "map": [
-    "config:rw",
-    "share:rw",
-    "ssl"
-  ],
-  "options": {
-    "log_level": "info",
-    "super_username": "admin@shinobi.video",
-    "super_password": "admin",
-    "mysql": false,
-    "mysql_host": "core-mariadb",
-    "mysql_username": "shinobi",
-    "mysql_password": "sh1n0b1",
-    "mysql_database": "shinobi",
-    "mysql_port": 3306,
-    "mail_service": "gmail",
-    "mail_username": "your_email@gmail.com",
-    "mail_password": "your_password",
-    "mail_host": "smtp.example.com",
-    "mail_port": 587,
-    "mail_secure": false,
-    "mail_cert_verify": true,
-    "ssl": false,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem"
-  },
-  "schema": {
-    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
-    "super_username": "email",
-    "super_password": "str",
-    "mysql": "bool",
-    "mysql_host": "str",
-    "mysql_username": "str",
-    "mysql_password": "str",
-    "mysql_database": "str",
-    "mysql_port": "port",
-    "mail_service": "match(^(gmail|smtp)$)",
-    "mail_username": "str",
-    "mail_password": "str",
-    "mail_host": "str",
-    "mail_port": "port",
-    "mail_secure": "bool",
-    "mail_cert_verify": "bool",
-    "ssl": "bool",
-    "certfile": "str",
-    "keyfile": "str"
-  },
-  "environment": {
-    "LOG_FORMAT": "{LEVEL}: {MESSAGE}"
-  },
-  "image": "hassioaddons/shinobi-{arch}"
-}
\ No newline at end of file
diff --git a/shinobi/icon.png b/shinobi/icon.png
deleted file mode 100644
index 661af8164..000000000
Binary files a/shinobi/icon.png and /dev/null differ
diff --git a/shinobi/logo.png b/shinobi/logo.png
deleted file mode 100644
index 506db4fee..000000000
Binary files a/shinobi/logo.png and /dev/null differ