diff --git a/README.md b/README.md
index ec047459..2395ebe0 100644
--- a/README.md
+++ b/README.md
@@ -965,10 +965,10 @@ SOFTWARE.
 [plex-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [plex-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [plex-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-portainer]: https://github.com/hassio-addons/addon-portainer/tree/v0.6.3
-[addon-doc-portainer]: https://github.com/hassio-addons/addon-portainer/blob/v0.6.3/README.md
+[addon-portainer]: https://github.com/hassio-addons/addon-portainer/tree/v0.7.0
+[addon-doc-portainer]: https://github.com/hassio-addons/addon-portainer/blob/v0.7.0/README.md
 [portainer-issue]: https://github.com/hassio-addons/addon-portainer/issues
-[portainer-version-shield]: https://img.shields.io/badge/version-v0.6.3-blue.svg
+[portainer-version-shield]: https://img.shields.io/badge/version-v0.7.0-blue.svg
 [portainer-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/portainer-armhf.svg
 [portainer-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [portainer-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/portainer/CHANGELOG.md b/portainer/CHANGELOG.md
index d21b40b4..2a81f861 100644
--- a/portainer/CHANGELOG.md
+++ b/portainer/CHANGELOG.md
@@ -1,12 +1,17 @@
 [Full Changelog][changelog]
 
-This is a general maintenance release.
+This is a major maintenance release, with major updates on the internals.
 
 ### 🔨 Changes
 
- :arrow_up: Upgrades Portainer to 1.21.0
+- :books: Adds info about showing Hass.io managed containers (#20)
+- :arrow_up: Upgrades nginx to 1.16.0-r2
+- :arrow_up: Upgrades add-on base image to v4.0.1
+- :fire: Removes now deprecated ssl directive
+- :pencil2: Maintaince -> Maintenance
+- :sparkles: Adds FUNDING.yml
 
-[changelog]: https://github.com/hassio-addons/addon-portainer/compare/v0.6.2...v0.6.3
+[changelog]: https://github.com/hassio-addons/addon-portainer/compare/v0.6.3...v0.7.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/portainer/README.md b/portainer/README.md
index ce9a7f82..90569b86 100644
--- a/portainer/README.md
+++ b/portainer/README.md
@@ -50,13 +50,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-portainer/blob/v0.6.3/README.md
+[docs]: https://github.com/hassio-addons/addon-portainer/blob/v0.7.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-portainer/68836?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-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-v0.6.3-blue.svg
-[release]: https://github.com/hassio-addons/addon-portainer/tree/v0.6.3
+[release-shield]: https://img.shields.io/badge/version-v0.7.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-portainer/tree/v0.7.0
 [screenshot]: https://github.com/hassio-addons/addon-portainer/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/portainer/config.json b/portainer/config.json
index a84b7f9b..776d70b6 100644
--- a/portainer/config.json
+++ b/portainer/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Portainer",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "slug": "portainer",
   "description": "Manage your Docker environment with ease",
   "url": "https://github.com/hassio-addons/addon-portainer",