diff --git a/content/en/docs/_index.md b/content/en/docs/_index.md
index aadb311..e802060 100644
--- a/content/en/docs/_index.md
+++ b/content/en/docs/_index.md
@@ -10,7 +10,7 @@ material for all supported [languages][] and [platforms][]:
 
   - [Introduction to gRPC](what-is-grpc/introduction/)
   - [Core concepts, architecture and lifecycle](what-is-grpc/core-concepts/)
-  - [FAQ](/faq/)
+  - [FAQ][]
 
 - **Eager to see gRPC in action?**
 
@@ -29,7 +29,8 @@ These are the officially supported gRPC language, platform and OS versions:
 
 {{< supported-lang-and-os >}}
 
-[language]: {{< relref "languages" >}}
-[languages]: {{< relref "languages" >}}
-[platform]: {{< relref "platforms" >}}
-[platforms]: {{< relref "platforms" >}}
+[FAQ]: {{< relref faq >}}
+[language]: {{< relref languages >}}
+[languages]: {{< relref languages >}}
+[platform]: {{< relref platforms >}}
+[platforms]: {{< relref platforms >}}
diff --git a/content/en/docs/what-is-grpc/faq.md b/content/en/docs/what-is-grpc/faq.md
index 2ce1dd6..f357771 100644
--- a/content/en/docs/what-is-grpc/faq.md
+++ b/content/en/docs/what-is-grpc/faq.md
@@ -45,7 +45,7 @@ All implementations are licensed under [Apache 2.0](https://github.com/grpc/grpc
 
 ### How can I contribute?
 
-[Contributors](/contribute/) are highly welcome and the repositories are hosted on GitHub. We look forward to community feedback, additions and bugs. Both individual contributors and corporate contributors need to sign our CLA. If you have ideas for a project around gRPC, please read guidelines and submit [here](https://github.com/grpc/grpc-contrib/blob/master/CONTRIBUTING.md). We have a growing list of projects under the [gRPC Ecosystem](https://github.com/grpc-ecosystem) organization on GitHub.
+[Contributors](/community/#contribute) are highly welcome and the repositories are hosted on GitHub. We look forward to community feedback, additions and bugs. Both individual contributors and corporate contributors need to sign our CLA. If you have ideas for a project around gRPC, read guidelines and submit [here](https://github.com/grpc/grpc-contrib/blob/master/CONTRIBUTING.md). We have a growing list of projects under the [gRPC Ecosystem](https://github.com/grpc-ecosystem) organization on GitHub.
 
 ### Where is the documentation?