diff --git a/README.md b/README.md
index cf11a2f49..f4f9c1c5c 100644
--- a/README.md
+++ b/README.md
@@ -548,10 +548,10 @@ SOFTWARE.
 [ssh-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [ssh-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [ssh-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-shinobi]: https://github.com/hassio-addons/addon-shinobi/tree/4c08156
-[addon-doc-shinobi]: https://github.com/hassio-addons/addon-shinobi/blob/4c08156/README.md
+[addon-shinobi]: https://github.com/hassio-addons/addon-shinobi/tree/2df71b8
+[addon-doc-shinobi]: https://github.com/hassio-addons/addon-shinobi/blob/2df71b8/README.md
 [shinobi-issue]: https://github.com/hassio-addons/addon-shinobi/issues
-[shinobi-version-shield]: https://img.shields.io/badge/version-4c08156-blue.svg
+[shinobi-version-shield]: https://img.shields.io/badge/version-2df71b8-blue.svg
 [shinobi-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/shinobi-armhf.svg
 [shinobi-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [shinobi-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/shinobi/CHANGELOG.md b/shinobi/CHANGELOG.md
index b6dc97aa7..8be4d5b65 100644
--- a/shinobi/CHANGELOG.md
+++ b/shinobi/CHANGELOG.md
@@ -1,14 +1,23 @@
 # Changelog since v0.2.0
 
-2018/06/03 12:39 UTC - [4c08156](https://github.com/hassio-addons/addon-shinobi/commit/4c08156a5398014a9315636405ee116f40e5ab93) by [@frenck](https://github.com/frenck)
+2018/06/12 20:08 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/06/12 20:08 UTC - [80803f7](https://github.com/hassio-addons/addon-shinobi/commit/80803f745387f38180de723270e1afdda9736a38) by [@frenck](https://github.com/frenck)
+> :rocket: Rewrites GitLab CI 
+
+2018/06/12 20:08 UTC - [e9fa795](https://github.com/hassio-addons/addon-shinobi/commit/e9fa79524215e3f1d47c42c7dfc1088857a7876b) by [@frenck](https://github.com/frenck)
+> :arrow_up: Updates Shinobi to 4d00c910f756167e8b04bd4a3795c2ffda3e823c 
+
+2018/06/12 20:08 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/06/03 12:39 UTC - [739de4d](https://github.com/hassio-addons/addon-shinobi/commit/739de4dd8d7bef104123bc8048e6a0d23103319a) by [@frenck](https://github.com/frenck)
+2018/06/12 20:08 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/06/03 12:39 UTC - [3e5533c](https://github.com/hassio-addons/addon-shinobi/commit/3e5533c9bfbd77997460440cdfc99e16e3b983d2) by [@frenck](https://github.com/frenck)
+2018/06/12 20:08 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/06/03 12:39 UTC - [759a811](https://github.com/hassio-addons/addon-shinobi/commit/759a811762d82708bfa56beecc4fa1d36f0bead9) by [@frenck](https://github.com/frenck)
+2018/06/12 20:08 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
index fc76b1a73..635972654 100644
--- a/shinobi/README.md
+++ b/shinobi/README.md
@@ -48,13 +48,13 @@ If you are more interested in stable releases of our add-ons:
 [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/4c08156/README.md
+[docs]: https://github.com/hassio-addons/addon-shinobi/blob/2df71b8/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-4c08156-blue.svg
-[release]: https://github.com/hassio-addons/addon-shinobi/tree/4c08156
+[release-shield]: https://img.shields.io/badge/version-2df71b8-blue.svg
+[release]: https://github.com/hassio-addons/addon-shinobi/tree/2df71b8
 [screenshot]: https://github.com/hassio-addons/addon-shinobi/raw/master/images/screenshot.jpg
 
diff --git a/shinobi/config.json b/shinobi/config.json
index 1162c4955..47c99be86 100644
--- a/shinobi/config.json
+++ b/shinobi/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Shinobi Pro",
-  "version": "4c08156",
+  "version": "2df71b8",
   "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",