diff --git a/docs/source/getting-started/faq.md b/docs/source/faq/faq.md
similarity index 100%
rename from docs/source/getting-started/faq.md
rename to docs/source/faq/faq.md
diff --git a/docs/source/faq/index.md b/docs/source/faq/index.md
index 82929a92..784995d8 100644
--- a/docs/source/faq/index.md
+++ b/docs/source/faq/index.md
@@ -5,4 +5,7 @@ Find answers to some of the most frequently-asked questions around JupyterHub an
 ```{toctree}
 :maxdepth: 2
 
+faq
+institutional-faq
+troubleshooting
 ```
diff --git a/docs/source/getting-started/institutional-faq.md b/docs/source/faq/institutional-faq.md
similarity index 99%
rename from docs/source/getting-started/institutional-faq.md
rename to docs/source/faq/institutional-faq.md
index 29fff4d0..982692c3 100644
--- a/docs/source/getting-started/institutional-faq.md
+++ b/docs/source/faq/institutional-faq.md
@@ -71,7 +71,7 @@ Here is a sample of organizations that use JupyterHub:
 - **Computing infrastructure providers**: NERSC, San Diego Supercomputing Center, Compute Canada
 - **Companies**: Capital One, SANDVIK code, Globus
 
-See the [Gallery of JupyterHub deployments](../gallery-jhub-deployments.md) for
+See the [Gallery of JupyterHub deployments](gallery-of-deployments) for
 a more complete list of JupyterHub deployments at institutions.
 
 ### How does JupyterHub compare with hosted products, like Google Colaboratory, RStudio.cloud, or Anaconda Enterprise?
diff --git a/docs/source/troubleshooting.md b/docs/source/faq/troubleshooting.md
similarity index 100%
rename from docs/source/troubleshooting.md
rename to docs/source/faq/troubleshooting.md
diff --git a/docs/source/gallery-jhub-deployments.md b/docs/source/gallery-jhub-deployments.md
index 822c51f0..bff92d27 100644
--- a/docs/source/gallery-jhub-deployments.md
+++ b/docs/source/gallery-jhub-deployments.md
@@ -1,3 +1,5 @@
+(gallery-of-deployments)=
+
 # A Gallery of JupyterHub Deployments
 
 **A JupyterHub Community Resource**
diff --git a/docs/source/getting-started/index.md b/docs/source/getting-started/index.md
index c16635d4..d02a3741 100644
--- a/docs/source/getting-started/index.md
+++ b/docs/source/getting-started/index.md
@@ -14,6 +14,4 @@ security-basics
 authenticators-users-basics
 spawners-basics
 services-basics
-faq
-institutional-faq
 ```
diff --git a/docs/source/index-admin.md b/docs/source/index-admin.md
index e85550d6..61da6b67 100644
--- a/docs/source/index-admin.md
+++ b/docs/source/index-admin.md
@@ -6,7 +6,6 @@ well as other information relevant to running your own JupyterHub over time.
 ```{toctree}
 :maxdepth: 2
 
-troubleshooting
 admin/capacity-planning
 admin/upgrading
 admin/log-messages