diff --git a/README.md b/README.md
index 72792366..ec047459 100644
--- a/README.md
+++ b/README.md
@@ -725,10 +725,10 @@ SOFTWARE.
 [adb-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [adb-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [adb-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-adguard]: https://github.com/hassio-addons/addon-adguard-home/tree/v1.2.0
-[addon-doc-adguard]: https://github.com/hassio-addons/addon-adguard-home/blob/v1.2.0/README.md
+[addon-adguard]: https://github.com/hassio-addons/addon-adguard-home/tree/v2.0.0
+[addon-doc-adguard]: https://github.com/hassio-addons/addon-adguard-home/blob/v2.0.0/README.md
 [adguard-issue]: https://github.com/hassio-addons/addon-adguard-home/issues
-[adguard-version-shield]: https://img.shields.io/badge/version-v1.2.0-blue.svg
+[adguard-version-shield]: https://img.shields.io/badge/version-v2.0.0-blue.svg
 [adguard-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/adguard-armhf.svg
 [adguard-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [adguard-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/adguard/CHANGELOG.md b/adguard/CHANGELOG.md
index 5e64ab4f..16b03e4d 100644
--- a/adguard/CHANGELOG.md
+++ b/adguard/CHANGELOG.md
@@ -1,19 +1,26 @@
 [Full Changelog][changelog]
 
-This release upgrades AdGuard Home to 0.96(hotfix), bringing in a load of new features!
+This release upgrades in the environment AdGuard is running in.
+However, it should not be a breaking upgrade.
+
+Furthermore, it contains a fix for the auto-discovery feature for the AdGuard integration in Home Assistant (0.95+).
 
 See the AdGuard Home release notes for an overview:
 <https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.96>
 
 ### 🔨 Changes
 
-- :arrow_up: Upgrades add-on base image to 3.1.1
-- :arrow_up: Upgrades AdGuard Home to 0.96-hotfix (#17) (@iwoloschin)
-- :hammer: Adds --no-check-update flag to AdGuard (#18) (@tjorim)
-- :books: Adds link to Hassio documentation about static IP and DNS (#20) (@mammuth)
-- ✨ Adds support for Home Assistant integration discovery (#15)
+- 🚑Automatically restart AdGuard in case of crash
+- 🚑 Extend wait timeout to 900 seconds
+- :arrow_up: Upgrades nginx to 1.16.0-r2
+- :arrow_up: Upgrades add-on base image to v4.0.1
+- :ambulance: Fixes Home Assistant integration discovery
+- :hammer: Re-instates dynamic Ingress port
+- :fire: Removes now deprecated ssl directive
+- :sparkles: Adds FUNDING.yml
+- :pencil2: Maintaince -> Maintenance
 
-[changelog]: https://github.com/hassio-addons/addon-adguard-home/compare/v1.1.1...v1.2.0
+[changelog]: https://github.com/hassio-addons/addon-adguard-home/compare/v1.2.0...v2.0.0
 
 Questions? Join our Discord server! https://discord.me/hassioaddons
 Enjoying my add-ons? Consider supporting my work: https://patreon.com/frenck
\ No newline at end of file
diff --git a/adguard/README.md b/adguard/README.md
index 4ec43572..ba38da36 100644
--- a/adguard/README.md
+++ b/adguard/README.md
@@ -44,13 +44,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-adguard-home/blob/v1.2.0/README.md
+[docs]: https://github.com/hassio-addons/addon-adguard-home/blob/v2.0.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-adguard-home/90684?u=frenck
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2019.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.2.0-blue.svg
-[release]: https://github.com/hassio-addons/addon-adguard-home/tree/v1.2.0
-[screenshot]: https://github.com/hassio-addons/addon-adguard-home/raw/v1.2.0/images/screenshot.png
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-v2.0.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-adguard-home/tree/v2.0.0
+[screenshot]: https://github.com/hassio-addons/addon-adguard-home/raw/v2.0.0/images/screenshot.png
\ No newline at end of file
diff --git a/adguard/config.json b/adguard/config.json
index 4cb85f6c..a4d525bc 100644
--- a/adguard/config.json
+++ b/adguard/config.json
@@ -1,12 +1,12 @@
 {
   "name": "AdGuard Home",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "slug": "adguard",
   "description": "Network-wide ads & trackers blocking DNS server",
   "url": "https://github.com/hassio-addons/addon-adguard-home",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:80]",
   "ingress": true,
-  "ingress_port": 45159,
+  "ingress_port": 0,
   "panel_icon": "mdi:shield-check",
   "startup": "services",
   "homeassistant": "0.92.0b2",