diff --git a/README.md b/README.md
index 7e8ac014..7385bdb2 100644
--- a/README.md
+++ b/README.md
@@ -991,10 +991,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/v6.3.3
-[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/v6.3.3/README.md
+[addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/v6.4.0
+[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/v6.4.0/README.md
 [ssh-issue]: https://github.com/hassio-addons/addon-ssh/issues
-[ssh-version-shield]: https://img.shields.io/badge/version-v6.3.3-blue.svg
+[ssh-version-shield]: https://img.shields.io/badge/version-v6.4.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 e2ef0623..0c7bb38d 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -4,12 +4,17 @@ This is a general maintenance release.
 
 ### 🔨 Changes
 
-- :arrow_up: Upgrades add-on base image to v4.1.1
-- :ambulance: Fixes path handling for SSL certificates
-- :hammer: Updates HA Auth URL in NGinx LUA script
-- :hammer: Use Hass.io DNS as NGinx resolver
+- :arrow_up: Upgrades add-on base image to v5.0.1
+- :fire: Removes secrets support, now natively supported by Hassio
+- :arrow_up: Upgrades openssl to 1.1.1d-r0
+- :arrow_up: Updates yamllint to v1.18.0 (#99)
+- 📚Remove iframe reference due to ingress (#100)
+- :arrow_up: Upgrades python3 to 3.7.5-r1
+- :arrow_up: Upgrades mariadb-client to 10.3.18-r0
+- :arrow_up: Upgrades openssh to 8.1_p1-r0
+- :arrow_up: Upgrades sqlite to 3.28.0-r1
 
-[changelog]: https://github.com/hassio-addons/addon-ssh/compare/v6.3.2...v6.3.3
+[changelog]: https://github.com/hassio-addons/addon-ssh/compare/v6.3.3...v6.4.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 1ca7dd93..3b84adcb 100644
--- a/ssh/README.md
+++ b/ssh/README.md
@@ -78,7 +78,7 @@ well. Additionally, it comes out of the box with the following:
 [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/v6.3.3/README.md
+[docs]: https://github.com/hassio-addons/addon-ssh/blob/v6.4.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/
@@ -88,8 +88,8 @@ well. Additionally, it comes out of the box with the following:
 [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-v6.3.3-blue.svg
-[release]: https://github.com/hassio-addons/addon-ssh/tree/v6.3.3
+[release-shield]: https://img.shields.io/badge/version-v6.4.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-ssh/tree/v6.4.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 47f74e98..5490ab53 100755
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "SSH & Web Terminal",
-  "version": "6.3.3",
+  "version": "6.4.0",
   "slug": "ssh",
   "description": "SSH & Web Terminal access to your Home Assistant instance",
   "url": "https://github.com/hassio-addons/addon-ssh",