diff --git a/docs.package.json b/docs.package.json
index 3128fdfa25..11dae9699d 100644
--- a/docs.package.json
+++ b/docs.package.json
@@ -17,6 +17,12 @@
     "target": "docs/03-container/components",
     "label": "k8s-cluster-api-provider"
   },
+  {
+    "repo": "SovereignCloudStack/cluster-stack-provider-openstack",
+    "source": "docs",
+    "target": "docs/03-container/components/cluster-stacks/components",
+    "label": "cluster-stack-provider-openstack"
+  },
   {
     "repo": "SovereignCloudStack/status-page-openapi",
     "source": "docs",
diff --git a/sidebarsDocs.js b/sidebarsDocs.js
index 630ecb1aa1..0a10b49e46 100644
--- a/sidebarsDocs.js
+++ b/sidebarsDocs.js
@@ -255,6 +255,25 @@ const sidebarsDocs = {
                 }
               ]
             },
+            {
+              type: 'category',
+              label: 'Cluster Stacks',
+              link: {
+                type: 'generated-index'
+              },
+              items: [
+                {
+                  type: 'category',
+                  label: 'Cluster Stack Provider OpenStack',
+                  items: [
+                    'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/overview',
+                    'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/quickstart',
+                    'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/controllers',
+                    'container/components/cluster-stacks/components/cluster-stack-provider-openstack/docs/develop'
+                  ]
+                }
+              ]
+            },
             {
               type: 'category',
               label: 'Container Registry',
diff --git a/static/data/architecturalOverviewData.json b/static/data/architecturalOverviewData.json
index 6947147a20..611f2a36de 100644
--- a/static/data/architecturalOverviewData.json
+++ b/static/data/architecturalOverviewData.json
@@ -29,16 +29,16 @@
       "buttonText": "Learn More",
       "components": [
         {
-          "title": "k8s Cluster API Provider",
+          "title": "KaaS V1: K8s Cluster API Provider",
           "url": "/docs/category/k8s-cluster-api-provider",
           "mandatory": "false",
           "stable": "true"
         },
         {
-          "title": "Cluster Stacks",
-          "url": "/docs/container",
+          "title": "KaaS V2: Cluster Stacks",
+          "url": "/docs/category/cluster-stacks",
           "mandatory": "false",
-          "stable": "false"
+          "stable": "true"
         },
         {
           "title": "Container Registry",