diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml
index d2f4313b..dafee6e6 100644
--- a/.github/workflows/deploy_docs.yml
+++ b/.github/workflows/deploy_docs.yml
@@ -34,7 +34,7 @@ jobs:
         run: npm run build -w documentation
 
       - name: Upload static Docusaurus site to S3
-        run: aws s3 sync documentation/build s3://smart-forms-docs/docz
+        run: aws s3 sync documentation/build s3://smart-forms-docs/docs
 
   deploy-storybook:
     name: Deploy Storybook to S3
diff --git a/deployment/cloudfront/SmartFormsRedirectToCorrectRoute.js b/deployment/cloudfront/SmartFormsRedirectToCorrectRoute.js
index 1167760a..c6c5cdb7 100644
--- a/deployment/cloudfront/SmartFormsRedirectToCorrectRoute.js
+++ b/deployment/cloudfront/SmartFormsRedirectToCorrectRoute.js
@@ -82,15 +82,15 @@ function handler(event) {
   }
 
 
-  // Handle Docs routes
-  if (uri.includes('/docs')) {
-    // Reroute to smartforms.csiro.au/docs/index.html
-    if (uri === '/docs/') {
+  // Handle Docz routes
+  if (uri.includes('/docz')) {
+    // Reroute to smartforms.csiro.au/docz/index.html
+    if (uri === '/docz/') {
       request.uri += 'index.html';
       return request;
     }
 
-    if (uri === '/docs') {
+    if (uri === '/docz') {
       request.uri = '/redirect.html';
       return request;
     }
diff --git a/documentation/docs/sdc/index.mdx b/documentation/docs/sdc/index.mdx
index 54e021d0..915a4708 100644
--- a/documentation/docs/sdc/index.mdx
+++ b/documentation/docs/sdc/index.mdx
@@ -11,7 +11,7 @@ The SDC specification provides a set of guidance around the use of Questionnaire
 
 :::tip
 
-Before diving into this section, it might be worth reading the [usage examples guide](/docs/components#usage-examples) in the Components section.
+Before diving into this section, it might be worth reading the [usage examples guide](/docs/components#usage-examples-guide) in the Components section.
 
 :::
 
diff --git a/documentation/docusaurus.config.ts b/documentation/docusaurus.config.ts
index 1672f320..35807377 100644
--- a/documentation/docusaurus.config.ts
+++ b/documentation/docusaurus.config.ts
@@ -12,7 +12,7 @@ const config: Config = {
   url: 'https://smartforms.csiro.au',
   // Set the /<baseUrl>/ pathname under which your site is served
   // For GitHub pages deployment, it is often '/<projectName>/'
-  baseUrl: '/docz',
+  baseUrl: '/docs',
 
   // GitHub pages deployment config.
   // If you aren't using GitHub pages, you don't need these.