diff --git a/README.md b/README.md
index 728b660c..e22d6cd7 100644
--- a/README.md
+++ b/README.md
@@ -1000,10 +1000,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.4.3
-[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/v6.4.3/README.md
+[addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/v7.0.0
+[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/v7.0.0/README.md
 [ssh-issue]: https://github.com/hassio-addons/addon-ssh/issues
-[ssh-version-shield]: https://img.shields.io/badge/version-v6.4.3-blue.svg
+[ssh-version-shield]: https://img.shields.io/badge/version-v7.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 72654d94..99b1ff4b 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,13 +1,87 @@
 [Full Changelog][changelog]
 
-This release contains an important fix, that prevented the add-on from starting on a lot of machines (e.g., i386 or armv7 machines).
+Time for a major release! 🎉 
 
-### 🔨 Changes
+This release upgrades a lot of the internals of the add-on, to the latest & greatest. But wait, there is more!
 
-- :ambulance: Fix incorrect use of base image, causing arch mixups (#93)
-- :arrow_up: Upgrades sqlite to 3.28.0-r2
+### Bash support is here!
 
-[changelog]: https://github.com/hassio-addons/addon-ssh/compare/v6.4.2...v6.4.3
+It has been requested quite a few times since the add-on existed. So if ZSH isn't your cup of tea, disable it in the add-on options by setting `zsh` to `false`.
+
+As an added bonus, Bash completion support is also installed and configured for use with the `hassio` and `hass-cli` commands.
+
+### Faster, but Ingress only Web Terminal
+
+The Web Terminal is now only accessible via Ingress, direct access has been removed. This removes a lot of moving parts from the add-on. Combined with the latest version of `ttyd` (which powers the Web Terminal), it has become lightning fast and responsive.
+
+The Terminal now leverages your browsers WebGL capabilities, making it fly! 🚀 
+
+### Hass.io CLI completion with ZSH
+
+The add-on ships with the latest Hass.io CLI, which now supports ZSH's auto-completion, which you can activate by hitting <tab> twice after you type part of the `hassio` command.
+
+![2019-12-29 14 17 36](https://user-images.githubusercontent.com/195327/71557417-254b7180-2a46-11ea-95f0-8998f7808674.gif)
+
+### Other noteworthy changes
+
+- Session sharing between SSH & the Web Terminal is now turned off by default. A lot of new users run into issues understanding how `tmux` works, hence, I've opted to disable session sharing by default.
+- Uses base images, based on the latest Alpine Linux 3.11.
+- All configuration options regarding the Web Terminal have been removed since with Ingress, they are no longer needed.
+
+## 🔨 All Changes
+
+Fetching origin
+- :arrow_up: Updates yamllint to v1.20.0 (#106)
+- :ambulance: Spelling and grammar fixes (#107)
+- :pencil2: Funding adjustments
+- :arrow_up: Upgrades add-on base image to v6.0.1
+- :arrow_up: Upgrades bsd-compat-headers to 0.7.2-r0
+- :arrow_up: Upgrades cmake to 3.15.5-r0
+- :arrow_up: Upgrades docker to 19.03.5-r0
+- :arrow_up: Upgrades openssl to 1.1.1d-r3
+- :arrow_up: Upgrades python3 to 3.8.0-r0
+- :arrow_up: Upgrades zlib-dev to 1.2.11-r3
+- :arrow_up: Upgrades device-mapper-libs to 2.02.186-r0
+- :arrow_up: Upgrades zsh-autosuggestions to 0.6.3-r0
+- :arrow_up: Upgrades nmap to 7.80-r1
+- :arrow_up: Upgrades vim to 8.2.0-r0
+- :arrow_up: Upgrades tmux to 3.0a-r0
+- :arrow_up: Upgrades nano to 4.6-r0
+- :arrow_up: Upgrades sudo to 1.8.29-r0
+- :arrow_up: Upgrades sqlite to 3.30.1-r1
+- :arrow_up: Upgrades rsync to 3.1.3-r2
+- :arrow_up: Upgrades networkmanager to 1.20.8-r0
+- :arrow_up: Upgrades ack to 3.2.0-r0
+- :arrow_up: Upgrades awake to 1.0-r4
+- :arrow_up: Upgrades bind-tools to 9.14.8-r5
+- :arrow_up: Upgrades bluez to 5.52-r0
+- :arrow_up: Upgrades mosquitto-clients to 1.6.8-r0
+- :arrow_up: Upgrades git to 2.24.1-r0
+- :arrow_up: Upgrades libltdl to 2.4.6-r7
+- :arrow_up: Upgrades libxml2-utils to 2.9.10-r1
+- :arrow_up: Upgrades mariadb-client to 10.4.10-r0
+- :arrow_up: Upgrades mosh to 1.3.2-r13
+- :arrow_up: Upgrades ncurses to 6.1_p20191130-r0
+- :arrow_up: Upgrades lua-resty-http to 0.15-r0
+- :arrow_up: Upgrades nginx to 1.16.1-r4
+- :sparkles: Adds htop
+- :arrow_up: Upgrades Hassio CLI to 3.1.2
+- :fire: Removes direct access to Web Terminal (Ingress only)
+- :hammer: Disable shared sessions by default
+- :hammer: Update Hass.io wheels for Alpine 3.11
+- :arrow_up: Upgrades libwebsockets to 3.2.1, added libuv support
+- :arrow_up: Upgrades ttyd to aed3faa3, WebGL & LibUV support
+- :sparkles: Adds support for using Bash instead of ZSH
+- :fire: Remove unused leave_front_door_open config
+- :shirt: Prettier JSON config file
+- :sparkles: Adds support for Bash completion
+- :ambulance: Work around a bug in latest sudo
+- :ambulance: Fix issue with tmux config with latest tmux
+- :sparkles: Adds Hass.io CLI auto complete support on ZSH
+- :fire: Remove add-on config for web ui link
+- :books: Update add-on documentation to match latest changes
+
+[changelog]: https://github.com/hassio-addons/addon-ssh/compare/v6.4.3...v7.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 a249b63a..021eb53b 100644
--- a/ssh/README.md
+++ b/ssh/README.md
@@ -4,9 +4,9 @@
 
 [![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
 
-[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
+[![Sponsor Frenck via GitHub Sponsors][github-sponsors-shield]][github-sponsors]
 
-[![Support my work on Patreon][patreon-shield]][patreon]
+[![Support Frenck on Patreon][patreon-shield]][patreon]
 
 This add-on allows you to log in to your Hass.io Home Assistant instance using
 SSH or by using the Web Terminal.
@@ -90,22 +90,22 @@ If you are more interested in stable releases of our add-ons:
 
 <https://github.com/hassio-addons/repository>
 
-[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
-[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.4.3/README.md
+[docs]: https://github.com/hassio-addons/addon-ssh/blob/v7.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
+[github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png
+[github-sponsors]: https://github.com/sponsors/frenck
 [hass-ssh]: https://home-assistant.io/addons/ssh/
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg
 [ohmyzsh]: http://ohmyz.sh/
 [openssh]: https://www.openssh.com/
-[patreon-shield]: https://www.frenck.nl/images/patreon.png
+[patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/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.4.3-blue.svg
-[release]: https://github.com/hassio-addons/addon-ssh/tree/v6.4.3
+[release-shield]: https://img.shields.io/badge/version-v7.0.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-ssh/tree/v7.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 8bd875fe..e1a77158 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,10 +1,9 @@
 {
   "name": "SSH & Web Terminal",
-  "version": "6.4.3",
+  "version": "7.0.0",
   "slug": "ssh",
   "description": "SSH & Web Terminal access to your Home Assistant instance",
   "url": "https://github.com/hassio-addons/addon-ssh",
-  "webui": "https://[HOST]:[PORT:80]",
   "startup": "services",
   "ingress": true,
   "ingress_port": 0,
@@ -19,17 +18,14 @@
     "i386"
   ],
   "ports": {
-    "22/tcp": 22,
-    "80/tcp": null
+    "22/tcp": 22
   },
   "ports_description": {
-    "22/tcp": "SSH server port (make empty to disable)",
-    "80/tcp": "Web Terminal (Not required for Hass.io Ingress)"
+    "22/tcp": "SSH server port (make empty to disable)"
   },
   "boot": "auto",
   "hassio_api": true,
   "hassio_role": "manager",
-  "auth_api": true,
   "homeassistant_api": true,
   "host_network": true,
   "auto_uart": true,
@@ -68,12 +64,8 @@
       "allow_remote_port_forwarding": false,
       "allow_tcp_forwarding": false
     },
-    "web": {
-      "ssl": true,
-      "certfile": "fullchain.pem",
-      "keyfile": "privkey.pem"
-    },
-    "share_sessions": true,
+    "zsh": true,
+    "share_sessions": false,
     "packages": [],
     "init_commands": []
   },
@@ -91,11 +83,7 @@
       "allow_remote_port_forwarding": "bool",
       "allow_tcp_forwarding": "bool"
     },
-    "web": {
-      "ssl": "bool",
-      "certfile": "str",
-      "keyfile": "str"
-    },
+    "zsh": "bool",
     "share_sessions": "bool",
     "packages": [
       "str"
@@ -103,8 +91,7 @@
     "init_commands": [
       "str"
     ],
-    "i_like_to_be_pwned": "bool?",
-    "leave_front_door_open": "bool?"
+    "i_like_to_be_pwned": "bool?"
   },
   "image": "hassioaddons/ssh-{arch}"
 }
\ No newline at end of file