diff --git a/docs/astro.config.mjs b/docs/astro.config.mjs
index 1ec9fc3..f77a8c4 100644
--- a/docs/astro.config.mjs
+++ b/docs/astro.config.mjs
@@ -34,25 +34,25 @@ export default defineConfig({
 					output: `packages`,
 					entryPoints: [`../packages/*`],
 				}),
-				starlightOpenAPI([
-					{
-						base: 'api/algod',
-						label: 'Algod',
-						schema: 'https://raw.githubusercontent.com/algorand/go-algorand/v3.25.0-stable/daemon/algod/api/algod.oas3.yml',
-					},
-					{
-						base: 'api/indexer',
-						label: 'Indexer',
-						schema: 'https://raw.githubusercontent.com/algorand/indexer/v3.5.0/api/indexer.oas3.yml',
-					},
-
-					{
-						base: 'api/kmd',
-						label: 'KMD',
-						schema: 'https://raw.githubusercontent.com/algorand/go-algorand/v3.25.0-stable/daemon/kmd/api/swagger.json',
-					},
+				//TODO: Fix the production openapi build, works in development
 
-				]),
+				// starlightOpenAPI([
+					// {
+					// 	base: 'api/algod',
+					// 	label: 'Algod',
+					// 	schema: 'https://raw.githubusercontent.com/algorand/go-algorand/v3.25.0-stable/daemon/algod/api/algod.oas3.yml',
+					// },
+					// {
+					// 	base: 'api/indexer',
+					// 	label: 'Indexer',
+					// 	schema: 'https://raw.githubusercontent.com/algorand/indexer/v3.5.0/api/indexer.oas3.yml',
+					// },
+					// {
+					// 	base: 'api/kmd',
+					// 	label: 'KMD',
+					// 	schema: 'https://raw.githubusercontent.com/algorand/go-algorand/v3.25.0-stable/daemon/kmd/api/swagger.json',
+					// },
+				// ]),
 			],
 			sidebar: [
 				{
@@ -66,11 +66,11 @@ export default defineConfig({
 					}
 				},
 				typeDocSidebarGroup,
-				{
-				label: "Services",
-					collapsed: true,
-					items: openAPISidebarGroups
-				},
+				// {
+				// label: "Services",
+				// 	collapsed: true,
+				// 	items: openAPISidebarGroups
+				// },
 			],
 		}),
 	],
diff --git a/docs/src/content/docs/index.mdx b/docs/src/content/docs/index.mdx
index 9e818b4..fcb3cb7 100644
--- a/docs/src/content/docs/index.mdx
+++ b/docs/src/content/docs/index.mdx
@@ -16,17 +16,17 @@ Next steps
     <LinkCard
         title="Core Library"
         description="Generated by @hey-api/opeanapi-ts"
-        href={`${import.meta.env.BASE_URL}/guides/fetch`}/>
+        href={`${import.meta.env.BASE_URL}/guides/core`}/>
     <LinkCard
-        title="Query Core"
-        description="Wrapper around @tanstack/query-core"
-        href={`${import.meta.env.BASE_URL}/guides/queries`}/>
+        title="Algod Client"
+        description="Interact with Algorand's Algod RPC"
+        href={`${import.meta.env.BASE_URL}/guides/clients/algod`}/>
     <LinkCard
-        title="React Query"
-        description="@tanstack/react-query"
-        href={`${import.meta.env.BASE_URL}/guides/queries`}/>
+        title="Indexer Client"
+        description="Interact with Algorand's Indexer RPC"
+        href={`${import.meta.env.BASE_URL}/guides/clients/indexer`}/>
     <LinkCard
-        title="Services"
-        description="OpenApi Doucmentation"
-        href={`${import.meta.env.BASE_URL}/api/intro`}/>
+        title="KMD Client"
+        description="Interact with Algorand's KMD RPC"
+        href={`${import.meta.env.BASE_URL}/guides/clients/kmd`}/>
 </CardGrid>