diff --git a/README.md b/README.md
index e11b2912b..16eb7468c 100644
--- a/README.md
+++ b/README.md
@@ -399,10 +399,10 @@ SOFTWARE.
 [aircast-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [aircast-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [aircast-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-airsonos]: https://github.com/hassio-addons/addon-airsonos/tree/53a30db
-[addon-doc-airsonos]: https://github.com/hassio-addons/addon-airsonos/blob/53a30db/README.md
+[addon-airsonos]: https://github.com/hassio-addons/addon-airsonos/tree/f22416b
+[addon-doc-airsonos]: https://github.com/hassio-addons/addon-airsonos/blob/f22416b/README.md
 [airsonos-issue]: https://github.com/hassio-addons/addon-airsonos/issues
-[airsonos-version-shield]: https://img.shields.io/badge/version-53a30db-blue.svg
+[airsonos-version-shield]: https://img.shields.io/badge/version-f22416b-blue.svg
 [airsonos-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/airsonos-armhf.svg
 [airsonos-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [airsonos-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/airsonos/CHANGELOG.md b/airsonos/CHANGELOG.md
index e273fdb94..8d6a2f0d7 100644
--- a/airsonos/CHANGELOG.md
+++ b/airsonos/CHANGELOG.md
@@ -1,13 +1,19 @@
 # Changelog since v0.4.0
 
-2018/06/03 18:03 UTC - [53a30db](https://github.com/hassio-addons/addon-airsonos/commit/53a30db2b15db621ba6fac09c5beb274a58c68bf) by [@frenck](https://github.com/frenck)
+2018/06/10 09:18 UTC - [f22416b](https://github.com/hassio-addons/addon-airsonos/commit/f22416b468c9ca91e7699ef4e3147c2d19b79171) by [@frenck](https://github.com/frenck)
+> :ambulance: Fixed incorrect base images in GitLab CI 
+
+2018/06/10 09:18 UTC - [a7e2e81](https://github.com/hassio-addons/addon-airsonos/commit/a7e2e8119370321273b486dc53805461a490c717) by [@frenck](https://github.com/frenck)
+> :rocket: Rewrites GitLab CI 
+
+2018/06/10 09:18 UTC - [53a30db](https://github.com/hassio-addons/addon-airsonos/commit/53a30db2b15db621ba6fac09c5beb274a58c68bf) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades Ubuntu base image to 2.0.0 
 
-2018/06/03 18:03 UTC - [9383c78](https://github.com/hassio-addons/addon-airsonos/commit/9383c784d97ee6edba72bd178b55ac5263497832) by [@frenck](https://github.com/frenck)
+2018/06/10 09:18 UTC - [9383c78](https://github.com/hassio-addons/addon-airsonos/commit/9383c784d97ee6edba72bd178b55ac5263497832) by [@frenck](https://github.com/frenck)
 > :books: Adds known issues and limitations to README
 
 Ref #4 
 
-2018/06/03 18:03 UTC - [dba0c34](https://github.com/hassio-addons/addon-airsonos/commit/dba0c34ae7be09e789f9b654645083d805391eea) by [@frenck](https://github.com/frenck)
+2018/06/10 09:18 UTC - [dba0c34](https://github.com/hassio-addons/addon-airsonos/commit/dba0c34ae7be09e789f9b654645083d805391eea) by [@frenck](https://github.com/frenck)
 > :rocket: Moves build-env to latest 
 
diff --git a/airsonos/README.md b/airsonos/README.md
index 65023e75e..edb08b333 100644
--- a/airsonos/README.md
+++ b/airsonos/README.md
@@ -46,10 +46,10 @@ 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-airsonos/blob/53a30db/README.md
+[docs]: https://github.com/hassio-addons/addon-airsonos/blob/f22416b/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-airsonos/36796?u=frenck
 [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-53a30db-blue.svg
-[release]: https://github.com/hassio-addons/addon-airsonos/tree/53a30db
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-f22416b-blue.svg
+[release]: https://github.com/hassio-addons/addon-airsonos/tree/f22416b
\ No newline at end of file
diff --git a/airsonos/config.json b/airsonos/config.json
index d61cc5b13..924d70e02 100644
--- a/airsonos/config.json
+++ b/airsonos/config.json
@@ -1,6 +1,6 @@
 {
   "name": "AirSonos",
-  "version": "53a30db",
+  "version": "f22416b",
   "slug": "airsonos",
   "description": "AirPlay capabilities for your Sonos (and UPnP) devices.",
   "url": "https://community.home-assistant.io/t/community-hass-io-add-on-airsonos/36796?u=frenck",