diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml
index bf9d64780..26ed3c0db 100644
--- a/docs/_data/navigation.yml
+++ b/docs/_data/navigation.yml
@@ -184,10 +184,14 @@ children:
             - name: Releasing new versions
               href: /docs/community/contributing/#releasing-new-versions
       - name: Support
-        href: /support
-        children:
-          - name: Support
-            href: /support
+        href: /docs/community/support/
+        children:
+          - name: StackOverflow
+            href: /docs/community/support/#stack-overflow
+          - name: Github Issues
+            href: /docs/community/support/#github-issues
+          - name: Commercial Support
+            href: /docs/community/support/#commercial-support
       - name: License
         href: /docs/community/license/
         children:
diff --git a/docs/_docs/03_community/support.md b/docs/_docs/03_community/support.md
index 714429ceb..55eb504ae 100644
--- a/docs/_docs/03_community/support.md
+++ b/docs/_docs/03_community/support.md
@@ -1,9 +1,31 @@
 ---
+layout: collection-browser-doc
 title: Support
 category: Community
-excerpt: Need help?
-tags: ["support"]
-redirect_to:
-  - /support/
+excerpt: >-
+  Need help?
+tags: ["support", "community"]
 order: 301
+nav_title: Documentation
+nav_title_link: /docs/
 ---
+
+## Stack Overflow
+
+Many developers use Stack Overflow to find help. Use the `terragrunt` tag to find [existing questions](https://stackoverflow.com/questions/tagged/terragrunt) or [ask your own](https://stackoverflow.com/questions/ask?tags=terragrunt).
+
+## Github Issues
+
+Read through [existing issues](https://github.com/gruntwork-io/terragrunt/issues) or post a new one. Github issues is a good place to:
+
+  - report a bug,
+
+  - ask for a help,
+
+  - ask for improvements,
+
+  - to start contributing by solving simple issues.
+
+## Commercial support
+
+If you need help with Terragrunt or anything else related to infrastructure or DevOps, Gruntwork offers [Commercial Support](https://gruntwork.io/support/) via Slack, email, and phone/video. If you’re already a Gruntwork customer, hop on Slack and ask away\! If not, [subscribe now](https://www.gruntwork.io/pricing/). If you’re not sure, feel free to email us at <support@gruntwork.io>.
diff --git a/docs/_pages/support/index.md b/docs/_pages/support/index.md
deleted file mode 100644
index da246f75b..000000000
--- a/docs/_pages/support/index.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-layout: subpage
-permalink: /support/
-slug: support-page
-title: Support
-subtitle: Need help?
-classes: text-large
----
-
-# Stack Overflow
-
-Many developers use Stack Overflow to find a help. Use `terragrunt` tag to find [existing questions](https://stackoverflow.com/questions/tagged/terragrunt) or [ask your own](https://stackoverflow.com/questions/ask?tags=terragrunt).
-
-# Github Issues
-
-Read through [existing issues](https://github.com/gruntwork-io/terragrunt/issues) or post a new one. Github issues is a good place to:
-
-  - report a bug,
-
-  - ask for a help,
-
-  - ask for improvements,
-
-  - to start contributing by solving simple issues.
-
-# Commercial support
-
-If you need help with Terragrunt or anything else related to infrastructure or DevOps, Gruntwork offers [Commercial Support](https://gruntwork.io/support/) via Slack, email, and phone/video. If you’re already a Gruntwork customer, hop on Slack and ask away\! If not, [subscribe now](https://www.gruntwork.io/pricing/). If you’re not sure, feel free to email us at <support@gruntwork.io>.