diff --git a/README.md b/README.md
index b0b63191..55606502 100644
--- a/README.md
+++ b/README.md
@@ -945,10 +945,10 @@ SOFTWARE.
 [phlex-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [phlex-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [phlex-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/tree/v3.0.2
-[addon-doc-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/blob/v3.0.2/README.md
+[addon-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/tree/v4.0.0
+[addon-doc-pi-hole]: https://github.com/hassio-addons/addon-pi-hole/blob/v4.0.0/README.md
 [pi-hole-issue]: https://github.com/hassio-addons/addon-pi-hole/issues
-[pi-hole-version-shield]: https://img.shields.io/badge/version-v3.0.2-blue.svg
+[pi-hole-version-shield]: https://img.shields.io/badge/version-v4.0.0-blue.svg
 [pi-hole-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/pi-hole-armhf.svg
 [pi-hole-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [pi-hole-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/pi-hole/CHANGELOG.md b/pi-hole/CHANGELOG.md
index 45e5988f..ca6c67c9 100644
--- a/pi-hole/CHANGELOG.md
+++ b/pi-hole/CHANGELOG.md
@@ -1,11 +1,48 @@
 [Full Changelog][changelog]
 
-### Changed
+🎉  This is a major release of the add-on, changing and improving a lot!
 
-- Fixes virtual host saving to env
-- Workaround Docker issue by reinstating legacy tags
+✨ First of all, this release introduces Ingress support. This means you can now access the interface from Home Assistant, even via the NabuCasa cloud. If you had configured a `panel_iframe`, you can no go ahead and remove that and check the "Show in Sidebar" toggle on the add-on page. Still, want to access the Pi-Hole web interface directly? You can always do that, by setting a port in the add-on network options.
 
-[changelog]: https://github.com/hassio-addons/addon-pi-hole/compare/v3.0.1...v3.0.2
+🔐 Pi-hole has single password protection (yeah, without username even), which is not really uh... Ok, we've improved that by adding Home Assistant authentication. You can now login with your HA username/password. However, when using Ingress, Home Assistant will take care of that for you 🎉  (So this only applies to direct access).
+
+🏡 Integrating the add-on with Home Assistant has always been a pain. We've solved that in this release, by adding a special endpoint for Pi-Hole integration of Home Assistant. The example in the add-on documentation is now a "copy, paste, restart & enjoy"-example. There is nothing more to it.
+
+🌐 The add-on has been adjusted to work and play nicely with the new Hass.io DNS services. Should solve a lot of headaches for quite a few people.
+
+### :hammer: Changes
+
+- :arrow_up: Upgrades gcc/g++ to 8.3.0-r0
+- :arrow_up: Upgrades wget to 1.20.3-r0
+- :arrow_up: Upgrades Pi-hole web interface to v4.3
+- :pencil2: Maintaince -> Maintenance
+- :arrow_up: Upgrades libexecinfo-dev to 1.1-r1
+- :arrow_up: Upgrades linux-headers to 4.19.36-r0
+- :arrow_up: Upgrades nettle-dev to 3.4.1-r1
+- :fire: Removes Bash, since the base image provides it
+- :arrow_up: Upgrades bc to 1.07.1-r1
+- :arrow_up: Upgrades bind-tools to 9.14.3-r0
+- :arrow_up: Upgrades coreutils to 8.31-r0
+- :arrow_up: Upgrades git to 2.22.0-r0
+- :arrow_up: Upgrades grep to 3.3-r0
+- :arrow_up: Upgrades libcap to 2.27-r0
+- :arrow_up: Upgrades libxml2 to 2.9.9-r2
+- :arrow_up: Upgrades ncurses to 6.1_p20190518-r0
+- :arrow_up: Upgrades openssl to 1.1.1c-r0
+- :arrow_up: Upgrades perl to 5.28.2-r1
+- :arrow_up: Upgrades sed to 4.7-r0
+- :arrow_up: Upgrades sudo to 1.8.27-r0
+- :arrow_up: Upgrades Pi-hole core to v4.3.1
+- :ambulance: Fixes path handling for SSL certificates
+- :arrow_up: Upgrades add-on base image to v4.1.1
+- :arrow_up: Upgrades musl-dev to 1.1.22-r3
+- :arrow_up: Upgrades php to 7.3.8-r0
+- :arrow_up: Upgrades nginx to 1.16.1-r0
+- :arrow_up: Upgrades Pi-hole FTL to v4.3.1
+- :tractor: :hammer: Complete rewrite of the add-on
+- :books: Updates documentation to match latest changes
+
+[changelog]: https://github.com/hassio-addons/addon-pi-hole/compare/v3.0.2...v4.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/pi-hole/README.md b/pi-hole/README.md
index 8bc919fc..fd488399 100644
--- a/pi-hole/README.md
+++ b/pi-hole/README.md
@@ -42,7 +42,7 @@ 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-pi-hole/blob/v3.0.2/README.md
+[docs]: https://github.com/hassio-addons/addon-pi-hole/blob/v4.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-pi-hole/33817?u=frenck
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg
@@ -50,5 +50,5 @@ If you are more interested in stable releases of our add-ons:
 [patreon]: https://www.patreon.com/frenck
 [pi-hole]: https://pi-hole.net/
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-v3.0.2-blue.svg
-[release]: https://github.com/hassio-addons/addon-pi-hole/tree/v3.0.2
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-v4.0.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-pi-hole/tree/v4.0.0
\ No newline at end of file
diff --git a/pi-hole/config.json b/pi-hole/config.json
index 43a8c390..d86c755c 100644
--- a/pi-hole/config.json
+++ b/pi-hole/config.json
@@ -1,10 +1,13 @@
 {
   "name": "Pi-hole",
-  "version": "3.0.2",
+  "version": "4.0.0",
   "slug": "pi-hole",
   "description": "Network-wide ad blocking using your Hass.io instance",
   "url": "https://github.com/hassio-addons/addon-pi-hole",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:4865]",
+  "ingress": true,
+  "ingress_port": 61478,
+  "panel_icon": "mdi:pi-hole",
   "startup": "system",
   "arch": [
     "aarch64",
@@ -13,10 +16,21 @@
     "armv7",
     "i386"
   ],
+  "ports": {
+    "53/udp": 53,
+    "80/tcp": null,
+    "4865/tcp": 4865
+  },
+  "ports_description": {
+    "53/udp": "DNS server port",
+    "80/tcp": "Web interface (Not required for Hass.io Ingress)",
+    "4865/tcp": "API endpoint (For HA integration)"
+  },
   "boot": "auto",
   "host_network": true,
   "hassio_api": true,
   "hassio_role": "default",
+  "auth_api": true,
   "privileged": [
     "NET_ADMIN"
   ],
@@ -25,10 +39,7 @@
     "ssl"
   ],
   "options": {
-    "password": "",
     "update_lists_on_start": false,
-    "admin_port": 4865,
-    "dns_port": 53,
     "ssl": true,
     "certfile": "fullchain.pem",
     "keyfile": "privkey.pem",
@@ -41,10 +52,7 @@
   },
   "schema": {
     "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
-    "password": "str",
     "update_lists_on_start": "bool",
-    "admin_port": "port",
-    "dns_port": "port",
     "ssl": "bool",
     "certfile": "str",
     "keyfile": "str",
@@ -59,7 +67,6 @@
         "ip": "match(((^\\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\\s*$)|(^\\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)(\\.(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)){3}))|:)))(%.+)?\\s*$)))"
       }
     ],
-    "i_like_to_be_pwned": "bool?",
     "leave_front_door_open": "bool?"
   },
   "image": "hassioaddons/pi-hole-{arch}"