diff --git a/.github/support.yml b/.github/support.yml
index 8587bbe..3f59f3c 100644
--- a/.github/support.yml
+++ b/.github/support.yml
@@ -12,7 +12,7 @@ supportComment: >
   However, this issue appears to be a support request. Please use our
   support channels to get help with the project.
 
-  Head over to the [Home Assistant community forum](https://community.home-assistant.io/)
+  Head over to the [Home Assistant community forum](https://community.home-assistant.io/t/home-assistant-community-add-on-lutron-certificate/70317?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 5d3383c..e43cfb0 100644
--- a/README.md
+++ b/README.md
@@ -186,7 +186,7 @@ SOFTWARE.
 [discord]: https://discord.me/hassioaddons
 [dockerhub]: https://hub.docker.com/r/hassioaddons/lutron-cert
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
-[forum]: https://community.home-assistant.io/t/community-hass-io-add-on-lutron-certificate/70317
+[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-lutron-certificate/70317?u=frenck
 [gitlabci-shield]: https://gitlab.com/hassio-addons/addon-lutron-cert/badges/master/pipeline.svg
 [gitlabci]: https://gitlab.com/hassio-addons/addon-lutron-cert/pipelines
 [i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
diff --git a/lutron-cert/.README.j2 b/lutron-cert/.README.j2
index f300929..d73bb65 100644
--- a/lutron-cert/.README.j2
+++ b/lutron-cert/.README.j2
@@ -86,7 +86,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/t/community-hass-io-add-on-lutron-certificate/70317
+[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-lutron-certificate/70317?u=frenck
 [lutron-caseta-docs]: https://www.home-assistant.io/components/lutron_caseta/
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
diff --git a/lutron-cert/Dockerfile b/lutron-cert/Dockerfile
index 057ae44..043b3de 100644
--- a/lutron-cert/Dockerfile
+++ b/lutron-cert/Dockerfile
@@ -51,7 +51,7 @@ LABEL \
     org.label-schema.build-date=${BUILD_DATE} \
     org.label-schema.name="Lutron Certificate" \
     org.label-schema.schema-version="1.0" \
-    org.label-schema.url="https://community.home-assistant.io/" \
+    org.label-schema.url="https://community.home-assistant.io/t/home-assistant-community-add-on-lutron-certificate/70317?u=frenck" \
     org.label-schema.usage="https://github.com/hassio-addons/addon-lutron-cert/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-lutron-cert" \