diff --git a/.github/support.yml b/.github/support.yml
index 27e688f..7853d19 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/?u=frenck)
+  [Home Assistant community forum](https://community.home-assistant.io/t/community-hass-io-add-on-wireguard/134662?u=frenck)
   or join our [Discord](https://discord.me/hassioaddons) chat.
 
 # Close issues marked as support requests
diff --git a/README.md b/README.md
index fbc7f48..5b983ef 100644
--- a/README.md
+++ b/README.md
@@ -595,7 +595,7 @@ SOFTWARE.
 [discord]: https://discord.me/hassioaddons
 [dockerhub]: https://hub.docker.com/r/hassioaddons/wireguard
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
-[forum]: https://community.home-assistant.io/?u=frenck
+[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-wireguard/134662?u=frenck
 [frenck]: https://github.com/frenck
 [gitlabci-shield]: https://gitlab.com/hassio-addons/addon-wireguard/badges/master/pipeline.svg
 [gitlabci]: https://gitlab.com/hassio-addons/addon-wireguard/pipelines
diff --git a/wireguard/.README.j2 b/wireguard/.README.j2
index ccd2b36..2eb5240 100644
--- a/wireguard/.README.j2
+++ b/wireguard/.README.j2
@@ -75,7 +75,7 @@ If you are more interested in stable releases of our add-ons:
 [discord]: https://discord.me/hassioaddons
 [docs]: {{ repo }}/blob/{{ version }}/README.md
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
-[forum]: https://community.home-assistant.io/?u=frenck
+[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-wireguard/134662?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
diff --git a/wireguard/Dockerfile b/wireguard/Dockerfile
index 5134a3d..6301931 100755
--- a/wireguard/Dockerfile
+++ b/wireguard/Dockerfile
@@ -51,7 +51,7 @@ LABEL \
     org.label-schema.build-date=${BUILD_DATE} \
     org.label-schema.name="WireGuard" \
     org.label-schema.schema-version="1.0" \
-    org.label-schema.url="https://community.home-assistant.io/?u=frenck" \
+    org.label-schema.url="https://community.home-assistant.io/t/community-hass-io-add-on-wireguard/134662?u=frenck" \
     org.label-schema.usage="https://github.com/hassio-addons/addon-wireguard/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-wireguard" \