diff --git a/.github/support.yml b/.github/support.yml
index 099683a18..b096809e0 100644
--- a/.github/support.yml
+++ b/.github/support.yml
@@ -12,7 +12,7 @@ supportComment: >
   support channels to get help with the project.
 
   Head over to the
-  [Home Assistant community forum](https://community.home-assistant.io/t/community-hass-io-add-on-ssh/33820?u=frenck)
+  [Home Assistant community forum](https://community.home-assistant.io/t/community-hass-io-add-on-ssh-web-terminal/33820?u=frenck)
   or join our [Discord](https://discord.gg/c5DvZ4e) chat.
 
 # Close issues marked as support requests
diff --git a/README.md b/README.md
index e92a6093b..aeb00bea8 100644
--- a/README.md
+++ b/README.md
@@ -434,7 +434,7 @@ SOFTWARE.
 [discord-shield]: https://img.shields.io/discord/330944238910963714.svg
 [discord]: https://discord.gg/c5DvZ4e
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
-[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-ssh/33820?u=frenck
+[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-ssh-web-terminal/33820?u=frenck
 [frenck]: https://github.com/frenck
 [github-ssh]: https://help.github.com/articles/connecting-to-github-with-ssh/
 [gitlabci-shield]: https://gitlab.com/hassio-addons/addon-ssh/badges/master/pipeline.svg
diff --git a/ssh/.README.j2 b/ssh/.README.j2
index 3e6ab863f..0d067deb0 100644
--- a/ssh/.README.j2
+++ b/ssh/.README.j2
@@ -106,7 +106,7 @@ If you are more interested in stable releases of our add-ons:
 [discord]: https://discord.gg/c5DvZ4e
 [docs]: {{ repo }}/blob/{{ version }}/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/33820?u=frenck
+[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/
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2018.svg
 [ohmyzsh]: http://ohmyz.sh/
diff --git a/ssh/Dockerfile b/ssh/Dockerfile
index b4ed8c4a3..a71c19c34 100755
--- a/ssh/Dockerfile
+++ b/ssh/Dockerfile
@@ -93,7 +93,7 @@ LABEL \
     org.label-schema.build-date=${BUILD_DATE} \
     org.label-schema.name="SSH & Web Terminal" \
     org.label-schema.schema-version="1.0" \
-    org.label-schema.url="https://community.home-assistant.io/t/community-hass-io-add-on-ssh/33820?u=frenck" \
+    org.label-schema.url="https://community.home-assistant.io/t/community-hass-io-add-on-ssh-web-terminal/33820?u=frenck" \
     org.label-schema.usage="https://github.com/hassio-addons/addon-ssh/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-ssh" \
diff --git a/ssh/config.json b/ssh/config.json
index a0d644aa2..8d8ba0a00 100755
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -3,7 +3,7 @@
   "version": "dev",
   "slug": "ssh",
   "description": "SSH & Web Terminal access to your Home Assistant instance",
-  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-ssh/33820?u=frenck",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-ssh-web-terminal/33820?u=frenck",
   "webui": "http://[HOST]:[PORT:7681]",
   "startup": "services",
   "arch": [