diff --git a/README.md b/README.md
index 7de1b0c2..2c283659 100644
--- a/README.md
+++ b/README.md
@@ -985,10 +985,10 @@ SOFTWARE.
 [sqlite-web-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [sqlite-web-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [sqlite-web-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/v5.0.2
-[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/v5.0.2/README.md
+[addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/v6.0.0
+[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/v6.0.0/README.md
 [ssh-issue]: https://github.com/hassio-addons/addon-ssh/issues
-[ssh-version-shield]: https://img.shields.io/badge/version-v5.0.2-blue.svg
+[ssh-version-shield]: https://img.shields.io/badge/version-v6.0.0-blue.svg
 [ssh-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/ssh-armhf.svg
 [ssh-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [ssh-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index fb324a96..9da1a513 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,19 +1,49 @@
 [Full Changelog][changelog]
 
-This release is a generic update release.
+This is a major release! With tons of updates on the internals.
+Nevertheless, it should not contain any breaking changes for most of us.
 
 ### 🔨 Changes
 
-- :books: Fixes spelling error in documentation (#74) (@nickdaria)
-- :arrow_up: Upgrades bind-tools to 9.12.4_p1-r1
-- :arrow_up: Upgrades lua-resty-http to 0.13-r0
-- :arrow_up: Upgrades MariaDB client to 10.3.13-r1
-- :arrow_up: Upgrades nginx to 1.14.2-r1
-- :arrow_up: Upgrades ttyd to 1.4.4
-- :arrow_up: Updates homeassistant_cli to v0.7.0 (#75)
-- :ambulance: Turns of Lua Resty core in Nginx
+- :arrow_up: Upgrades MariaDB client to 10.3.15-r0
+- :arrow_up: Updates yamllint to v1.16.0 (#80)
+- :arrow_up: Upgrades base image to v1.1.2
+- :arrow_up: Upgrades SQLite to 3.28.0-r0
+- :arrow_up: Upgrades vim to 8.1.1365-r0 (CVE-2019-12735)
+- :arrow_up: Switches base image to default base v4.0.0
+- :arrow_up: Upgrades cmake to 3.14.5-r0
+- :arrow_up: Upgrades docker to 18.09.6-r0
+- :arrow_up: Upgrades openssl-dev to 1.1.1c-r0
+- :arrow_up: Upgrades ack to 3.0.0-r0
+- :arrow_up: Upgrades awake to 1.0-r3
+- :arrow_up: Upgrades bind-tools to 9.14.1-r1
+- :arrow_up: Upgrades bluez to 5.50-r3
+- :arrow_up: Upgrades colordiff to 1.0.18-r1
+- :arrow_up: Upgrades device-mapper-libs to 2.02.184-r0
+- :arrow_up: Upgrades git to 2.22.0-r0
+- :arrow_up: Upgrades libltdl to 2.4.6-r6
+- :arrow_up: Upgrades libxml2-utils to 2.9.9-r2
+- :arrow_up: Upgrades mariadb-client to 10.3.16-r0
+- :arrow_up: Upgrades mosh to 1.3.2-r8
+- :arrow_up: Upgrades mosquitto-clients to 1.6.3-r0
+- :arrow_up: Upgrades nano to 4.3-r0
+- :arrow_up: Upgrades ncurses to 6.1_p20190518-r0
+- :arrow_up: Upgrades nginx to 1.16.0-r2
+- :arrow_up: Upgrades openssh to 8.0_p1-r0
+- :arrow_up: Upgrades openssl to 1.1.1c-r0
+- :arrow_up: Upgrades sudo to 1.8.27-r0
+- :arrow_up: Upgrades tmux to 2.9a-r0
+- :arrow_up: Upgrades zsh-autosuggestions to 0.6.1-r0
+- :arrow_up: Upgrades zsh to 5.7.1-r0
+- :sparkles: Adds Python from Alpine
+- :hammer: Removes ssl now deprecated ssl directive
+- :fire: Removes dropped tmux config directives
+- :arrow_up: Upgrades add-on base image to v4.0.1
+- :pencil2: Maintaince -> Maintenance
+- :sparkles: Adds FUNDING.yml
+- :arrow_up: Upgrades ttyd to 1.5.
 
-[changelog]: https://github.com/hassio-addons/addon-ssh/compare/v5.0.1...v5.0.2
+[changelog]: https://github.com/hassio-addons/addon-ssh/compare/v5.0.2...v6.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/ssh/README.md b/ssh/README.md
index 9fa239be..15147b63 100644
--- a/ssh/README.md
+++ b/ssh/README.md
@@ -94,7 +94,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-ssh/blob/v5.0.2/README.md
+[docs]: https://github.com/hassio-addons/addon-ssh/blob/v6.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-ssh-web-terminal/33820?u=frenck
 [hass-ssh]: https://home-assistant.io/addons/ssh/
@@ -104,8 +104,8 @@ If you are more interested in stable releases of our add-ons:
 [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-v5.0.2-blue.svg
-[release]: https://github.com/hassio-addons/addon-ssh/tree/v5.0.2
+[release-shield]: https://img.shields.io/badge/version-v6.0.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-ssh/tree/v6.0.0
 [screenshot]: https://github.com/hassio-addons/addon-ssh/raw/master/images/screenshot.png
 [ssh-audit-image]: https://github.com/hassio-addons/addon-ssh/raw/master/images/ssh-audit.png
 [ssh-audit]: https://github.com/arthepsy/ssh-audit
diff --git a/ssh/config.json b/ssh/config.json
index e7ea6ffd..126786c4 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "SSH & Web Terminal",
-  "version": "5.0.2",
+  "version": "6.0.0",
   "slug": "ssh",
   "description": "SSH & Web Terminal access to your Home Assistant instance",
   "url": "https://github.com/hassio-addons/addon-ssh",