diff --git a/amplify.yml b/amplify.yml
index c6b52e3d28c..96094a2e115 100644
--- a/amplify.yml
+++ b/amplify.yml
@@ -15,9 +15,9 @@ applications:
             - node -v
             - yarn build
       artifacts:
-        baseDirectory: out
+        baseDirectory: .next
         files:
-          - "**/*"
+          - '**/*'
       cache:
         paths:
           - node_modules/**/*
diff --git a/docs/next.config.js b/docs/next.config.js
index e29c630a25b..8c948727440 100644
--- a/docs/next.config.js
+++ b/docs/next.config.js
@@ -51,7 +51,7 @@ module.exports = withNextPluginPreval({
   },
 
   // These redirects are because of the IA change from previous docs
-  redirects() {
+  async redirects() {
     return [
       // Normalizing URLs
       // these need to come before the generic redirects
diff --git a/docs/package.json b/docs/package.json
index 7db35fd3095..cf5cb973647 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.1",
   "scripts": {
     "dev": "next dev -p 5000",
-    "build": "next build && next export",
+    "build": "next build",
     "lint": "next lint",
     "start": "next start",
     "test": "$_ run build"
diff --git a/docs/src/pages/theming/index.page.mdx b/docs/src/pages/theming/index.page.mdx
index 1374043ee4d..0cf374688a4 100644
--- a/docs/src/pages/theming/index.page.mdx
+++ b/docs/src/pages/theming/index.page.mdx
@@ -61,7 +61,7 @@ If you want more customization than the design tokens provide, you can also over
 }
 ```
 
-Or if you prefer you can use [alternative styling with a styling libraries](alternativeStyling)
+Or if you prefer you can use [alternative styling with a styling libraries](/theming/alternative-styling)
 
 #### Unstyled