diff --git a/.changeset/shaggy-baths-jump.md b/.changeset/shaggy-baths-jump.md
new file mode 100644
index 0000000..0c8a23f
--- /dev/null
+++ b/.changeset/shaggy-baths-jump.md
@@ -0,0 +1,5 @@
+---
+"@usace-watermanagement/groundwork-water": patch
+---
+
+Updating routing in docs by removing leading /#/ can setting base_Url to be "/groundwork-water/" : "/"
diff --git a/docs/src/App.jsx b/docs/src/App.jsx
index e6718d6..efa74bc 100644
--- a/docs/src/App.jsx
+++ b/docs/src/App.jsx
@@ -25,7 +25,12 @@ function App() {
   }
 
   return (
-    <div onClick={getNavHelper((url) => doUpdateHash(url))}>
+    <div
+      onClick={getNavHelper((url) => {
+        if (url.includes("/#")) url = url.replace("/#", "");
+        doUpdateHash(url);
+      })}
+    >
       <SiteWrapper
         fluidNav={true}
         links={links}
diff --git a/docs/src/pages/docs/forms/index.jsx b/docs/src/pages/docs/forms/index.jsx
index 27a5326..43a9e2b 100644
--- a/docs/src/pages/docs/forms/index.jsx
+++ b/docs/src/pages/docs/forms/index.jsx
@@ -19,7 +19,7 @@ function FormsDocs() {
       <Text className="mb-4">
         Start with the{" "}
         <Link
-          href={`${BASE_URL}/#/docs/forms/cwms-form`}
+          href={`${BASE_URL}#/docs/forms/cwms-form`}
           className="text-blue-600 hover:underline font-semibold"
         >
           CWMSForm
@@ -33,7 +33,7 @@ function FormsDocs() {
       <ul className="list-disc ml-6 space-y-2">
         <li>
           <Link
-            href={`${BASE_URL}/#/docs/forms/cwms-form`}
+            href={`${BASE_URL}#/docs/forms/cwms-form`}
             className="text-blue-600 hover:underline font-semibold"
           >
             CWMSForm
@@ -42,7 +42,7 @@ function FormsDocs() {
         </li>
         <li>
           <Link
-            href={`${BASE_URL}/#/docs/forms/cwms-input`}
+            href={`${BASE_URL}#/docs/forms/cwms-input`}
             className="text-blue-600 hover:underline font-semibold"
           >
             CWMSInput
@@ -51,7 +51,7 @@ function FormsDocs() {
         </li>
         <li>
           <Link
-            href={`${BASE_URL}/#/docs/forms/cwms-textarea`}
+            href={`${BASE_URL}#/docs/forms/cwms-textarea`}
             className="text-blue-600 hover:underline font-semibold"
           >
             CWMSTextarea
@@ -60,7 +60,7 @@ function FormsDocs() {
         </li>
         <li>
           <Link
-            href={`${BASE_URL}/#/docs/forms/cwms-checkboxes`}
+            href={`${BASE_URL}#/docs/forms/cwms-checkboxes`}
             className="text-blue-600 hover:underline font-semibold"
           >
             CWMSCheckboxes
@@ -69,7 +69,7 @@ function FormsDocs() {
         </li>
         <li>
           <Link
-            href={`${BASE_URL}/#/docs/forms/cwms-radio-group`}
+            href={`${BASE_URL}#/docs/forms/cwms-radio-group`}
             className="text-blue-600 hover:underline font-semibold"
           >
             CWMSRadioGroup
@@ -78,7 +78,7 @@ function FormsDocs() {
         </li>
         <li>
           <Link
-            href={`${BASE_URL}/#/docs/forms/cwms-dropdown`}
+            href={`${BASE_URL}#/docs/forms/cwms-dropdown`}
             className="text-blue-600 hover:underline font-semibold"
           >
             CWMSDropdown
@@ -87,7 +87,7 @@ function FormsDocs() {
         </li>
         <li>
           <Link
-            href={`${BASE_URL}/#/docs/forms/cwms-input-table`}
+            href={`${BASE_URL}#/docs/forms/cwms-input-table`}
             className="text-blue-600 hover:underline font-semibold"
           >
             CWMSInputTable
@@ -96,7 +96,7 @@ function FormsDocs() {
         </li>
         <li>
           <Link
-            href={`${BASE_URL}/#/docs/forms/cwms-spreadsheet`}
+            href={`${BASE_URL}#/docs/forms/cwms-spreadsheet`}
             className="text-blue-600 hover:underline font-semibold"
           >
             CWMSSpreadsheet
diff --git a/docs/vite.config.js b/docs/vite.config.js
index ffe9356..ca07270 100644
--- a/docs/vite.config.js
+++ b/docs/vite.config.js
@@ -4,10 +4,7 @@ import pkg from "../package.json";
 import tailwindcss from "tailwindcss";
 
 export default defineConfig(({ mode }) => {
-  const base =
-    mode === "production"
-      ? "https://USACE-WaterManagement.github.io/groundwork-water/"
-      : "http://localhost:5173/";
+  const base = mode === "production" ? "/groundwork-water/" : "/";
   return {
     plugins: [react(), tailwindcss()],
     base: base,
diff --git a/vite.config.ts b/vite.config.ts
index 40e3cdf..9489ee2 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -44,10 +44,7 @@ export default defineConfig(({ mode }) => {
     };
   } else {
     console.log("Building Docs App: ", mode);
-    const base =
-      mode === "production"
-        ? "https://USACE-WaterManagement.github.io/groundwork-water/"
-        : "http://localhost:5173/";
+    const base = mode === "production" ? "/groundwork-water/" : "/";
     return {
       plugins: [react(), tailwindcss()],
       base: base,