diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 9674dac8..95e55fa1 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -18,7 +18,7 @@ jobs:
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.DOCS_AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.DOCS_AWS_SECRET_ACCESS_KEY }}
-      AWS_DEFAULT_REGION: "eu-east-1"
+      AWS_DEFAULT_REGION: "us-east-1"
 
     steps:
       - name: Set Tag Name
diff --git a/docs/index.md b/docs/index.md
index 695f68ef..72f06d57 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -18,24 +18,22 @@ system changes.
 
 ## Learn More
 
-* [Dagger vs. Other Software](doc/vs)
-* [Dagger Programming Guide](doc/programming)
-* [Dagger Operator Manual](doc/operator)
-
+* [Dagger vs. Other Software](vs)
+* [Dagger Programming Guide](programming)
+* [Dagger Operator Manual](operator)
 
 ## Download and Install
 
-* [Install Dagger from source](doc/install)
-* Binary distributions [*coming soon*]
+* [Install Dagger](install)
 
 ## Community
 
 Join the [Dagger community chatroom](https://discord.gg/Rmffpmc) on Discord.
 We welcome beginners and experts alike!
 
-
 ## Alpha disclaimer
 
-Dagger is *alpha-quality software*. It has many bugs, the user interface is minimal, and it may change in incompatible ways at any time. If you are still willing to try it, thank you! We appreciate your help and encourage you to ask questions and report issues.
-
-
+Dagger is *alpha-quality software*. It has many bugs, the user interface is
+minimal, and it may change in incompatible ways at any time. If you are still
+willing to try it, thank you! We appreciate your help and encourage you to ask
+questions and report issues.
diff --git a/docs/sidebar/sidebar.yml b/docs/sidebar/sidebar.yml
index e4ac6701..7c8862eb 100644
--- a/docs/sidebar/sidebar.yml
+++ b/docs/sidebar/sidebar.yml
@@ -1,32 +1,24 @@
 # Sidebar navigation
 
-- label: 'Install deploy'
-  link: '/install'
+- label: Introduction
+  link: "/"
 
-- label: 'Operator'
-  link: '/operator'
+- label: "Getting started"
+  link: "/install"
 
-- label: 'Programming'
-  link: '/programming'
+- label: "Dagger vs. Other"
+  link: "/vs"
 
-- label: 'VS'
-  link: '/vs'
-
-- label: 'Getting started'
-  link: '/getting-started'
-
-- label: Usage
+- label: Guides
   items:
-    - label: 'Creating docs'
-      link: '/usage/creating-docs'
-    - label: 'Navigation'
-      link: '/usage/navigation'
-    - label: 'Shadowing'
-      link: '/usage/shadowing'
+    - label: "Programming Guide"
+      link: "/programming"
+    - label: "Operator Manual"
+      link: "/operator"
 
 - label: More
   items:
-    - label: FAQ
-      link: /faq
-    - label: 'Github'
+    - label: "GitHub"
       link: https://github.com/dagger/dagger
+    - label: "Discord"
+      link: https://discord.gg/Rmffpmc
diff --git a/tools/gendocs/src/@rocketseat/gatsby-theme-docs/components/Sidebar/Select/index.js b/tools/gendocs/src/@rocketseat/gatsby-theme-docs/components/Sidebar/Select/index.js
index bcab8dba..28408042 100644
--- a/tools/gendocs/src/@rocketseat/gatsby-theme-docs/components/Sidebar/Select/index.js
+++ b/tools/gendocs/src/@rocketseat/gatsby-theme-docs/components/Sidebar/Select/index.js
@@ -9,15 +9,17 @@ const Select = () => {
 
     useEffect(() => {
         async function getTags() {
-            const fetchTags = await fetch('https://s3-eu-west-1.amazonaws.com/daggerdoc.humans-it.com/tags.json').then(result => result.json());
-            setTagsList(fetchTags);
+            const fetchTags = await fetch('/tags.json').then(result => result.json());
+            if (fetchTags.length > 0) {
+                setTagsList(fetchTags);
+            }
         }
 
         getTags()
     }, [])
 
     return (
-        <SelectStyled value={currentLocation[currentLocation.length - 1]} onChange={(e) => isBrowser ? window.location.pathname = `/${e.currentTarget.value}/index.html` : null}>
+        <SelectStyled value={currentLocation[currentLocation.length - 1]} onChange={(e) => isBrowser ? window.location.pathname = `/${e.currentTarget.value}` : null}>
             {tagsList.map(t => (
                 <option>{t.tag}</option>
             ))}