diff --git a/README.md b/README.md
index 1f43d517..05f9310b 100644
--- a/README.md
+++ b/README.md
@@ -588,10 +588,10 @@ SOFTWARE.
 [ide-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [ide-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [ide-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-influxdb]: https://github.com/hassio-addons/addon-influxdb/tree/v1.1.1
-[addon-doc-influxdb]: https://github.com/hassio-addons/addon-influxdb/blob/v1.1.1/README.md
+[addon-influxdb]: https://github.com/hassio-addons/addon-influxdb/tree/v1.2.0
+[addon-doc-influxdb]: https://github.com/hassio-addons/addon-influxdb/blob/v1.2.0/README.md
 [influxdb-issue]: https://github.com/hassio-addons/addon-influxdb/issues
-[influxdb-version-shield]: https://img.shields.io/badge/version-v1.1.1-blue.svg
+[influxdb-version-shield]: https://img.shields.io/badge/version-v1.2.0-blue.svg
 [influxdb-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/influxdb-armhf.svg
 [influxdb-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [influxdb-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/influxdb/CHANGELOG.md b/influxdb/CHANGELOG.md
index b3c0fc1d..87cb02e9 100644
--- a/influxdb/CHANGELOG.md
+++ b/influxdb/CHANGELOG.md
@@ -1,7 +1,20 @@
 [Full Changelog][changelog]
 
-### Fixed
+This release upgrades a lot (including InfluxDB), fixes a couple of issues with timing between starting all the services and adds authentication against Home Assistant!
 
-- Fixes typo in function call
+From this point on, you can log in, into the web interface, using your Home Assistant frontend username and password.
 
-[changelog]: https://github.com/hassio-addons/addon-influxdb/compare/v1.1.0...v1.1.1
\ No newline at end of file
+### Changed
+
+- Upgrades InfluxDB to v1.7.0
+- Upgrades Chronograf to v1.7.1
+- Give InfluxDB more time to start, before init script
+- Makes Chronograf wait until InfluxDB is started
+- Makes Kapacitor wait until InfluxDB is started
+- Removes ipv6 configuration option
+- Upgrades nginx to 1.14.0-0ubuntu1.2
+- Adds support for the authentication against Home Assistant
+- Limit supported machines (#12) (@HoppingMonk)
+- Updates documentation for HA Auth
+
+[changelog]: https://github.com/hassio-addons/addon-influxdb/compare/v1.1.1...v1.2.0
\ No newline at end of file
diff --git a/influxdb/README.md b/influxdb/README.md
index aa3c5245..d6fbe0d0 100644
--- a/influxdb/README.md
+++ b/influxdb/README.md
@@ -46,13 +46,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/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
-[docs]: https://github.com/hassio-addons/addon-influxdb/blob/v1.1.1/README.md
+[docs]: https://github.com/hassio-addons/addon-influxdb/blob/v1.2.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-influxdb/54491?u=frenck
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
 [patreon-shield]: https://www.frenck.nl/images/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-v1.1.1-blue.svg
-[release]: https://github.com/hassio-addons/addon-influxdb/tree/v1.1.1
+[release-shield]: https://img.shields.io/badge/version-v1.2.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-influxdb/tree/v1.2.0
 [screenshot]: https://github.com/hassio-addons/addon-influxdb/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/influxdb/config.json b/influxdb/config.json
index 6c61f4d6..88d9bb96 100644
--- a/influxdb/config.json
+++ b/influxdb/config.json
@@ -1,6 +1,6 @@
 {
   "name": "InfluxDB",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "slug": "influxdb",
   "description": "Scalable datastore for metrics, events, and real-time analytics",
   "url": "https://community.home-assistant.io/t/community-hass-io-add-on-influxdb/54491?u=frenck",
@@ -12,6 +12,19 @@
     "armhf",
     "i386"
   ],
+  "machine": [
+    "intel-nuc",
+    "qemux86",
+    "qemux86-64",
+    "qemuarm",
+    "qemuarm-64",
+    "raspberrypi2",
+    "raspberrypi3",
+    "raspberrypi3-64",
+    "tinker",
+    "odroid-c2",
+    "odroid-xu"
+  ],
   "map": [
     "config:rw",
     "share:rw",
@@ -23,29 +36,23 @@
     "8888/tcp": 8888
   },
   "hassio_api": true,
+  "auth_api": true,
   "hassio_role": "default",
   "homeassistant_api": false,
   "host_network": false,
   "options": {
     "log_level": "info",
-    "username": "",
-    "password": "",
     "auth": true,
     "ssl": true,
     "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem",
-    "ipv6": true
+    "keyfile": "privkey.pem"
   },
   "schema": {
     "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
-    "username": "str",
-    "password": "str",
     "auth": "bool",
     "ssl": "bool",
     "certfile": "str",
     "keyfile": "str",
-    "ipv6": "bool",
-    "i_like_to_be_pwned": "bool?",
     "leave_front_door_open": "bool?"
   },
   "environment": {