diff --git a/README.md b/README.md
index ca5379086..82f6b6479 100644
--- a/README.md
+++ b/README.md
@@ -152,3 +152,4 @@ See the policy [here](./SECURITY.md)
 See the exact licensing terms [here](./LICENSE)
 
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
diff --git a/docs/docs/apis/openidoauth/grant-types.md b/docs/docs/apis/openidoauth/grant-types.md
index ddf7921eb..4e435455e 100644
--- a/docs/docs/apis/openidoauth/grant-types.md
+++ b/docs/docs/apis/openidoauth/grant-types.md
@@ -15,7 +15,7 @@ For a list of supported or unsupported `Grant Types` please have a look at the t
 | Refresh Token                                         | yes                 |
 | Resource Owner Password Credentials                   | no                  |
 | Security Assertion Markup Language (SAML) 2.0 Profile | no                  |
-| Token Exchange                                        | work in progress    |
+| Token Exchange                                        | no    |
 
 ## Authorization Code
 
diff --git a/docs/docs/concepts/introduction.mdx b/docs/docs/concepts/introduction.mdx
index 91b141403..2a1ee79a6 100644
--- a/docs/docs/concepts/introduction.mdx
+++ b/docs/docs/concepts/introduction.mdx
@@ -13,8 +13,7 @@ Please be reminded that ZITADEL is open source — and so is the documentation.
 <Column>
   <ListWrapper title="General">
     <ListElement link="./principles" type={ICONTYPE.TASKS} title="Principles" description="Design and engineering principles" />
-    <ListElement link="./eventstore" type={ICONTYPE.STORAGE} title="Eventstore" description="Learn how ZITADEL stores data" />
-    <ListElement link="./architecture" type={ICONTYPE.ARCHITECTURE} title="Architecture" description="Sotware-, Cluster- and Multi Cluster Architecture" />
+    <ListElement link="./architecture/software" type={ICONTYPE.ARCHITECTURE} title="Architecture" description="Sotware-, Cluster- and Multi Cluster Architecture" />
   </ListWrapper>
   <ListWrapper title="Structure">
     <Column>
@@ -40,6 +39,6 @@ Please be reminded that ZITADEL is open source — and so is the documentation.
     <ListElement link="./features/actions" type={ICONTYPE.FILE} title="Actions" description="Customizing ZITADELs behavior using the actions feature" />
   </ListWrapper>
     <ListWrapper title="Customer Portal">
-      <ListElement link="./customerportal/instances" type={ICONTYPE.INSTANCE} title="Instances" description="Manage all your ZITADEL instances" />
+      <ListElement link="../guides/manage/cloud/instances" type={ICONTYPE.INSTANCE} title="Instances" description="Manage all your ZITADEL instances" />
     </ListWrapper>
 </Column>
diff --git a/docs/src/pages/index.js b/docs/src/pages/index.js
index 6fbc5ae75..e8ea37781 100644
--- a/docs/src/pages/index.js
+++ b/docs/src/pages/index.js
@@ -171,13 +171,7 @@ const features = [
           description="Design and engineering principles"
         />
         <ListElement
-          link="./docs/concepts/eventstore"
-          type={ICONTYPE.STORAGE}
-          title="Eventstore"
-          description="Learn how ZITADEL stores data"
-        />
-        <ListElement
-          link="./docs/concepts/architecture"
+          link="./docs/concepts/architecture/software"
           type={ICONTYPE.ARCHITECTURE}
           title="Architecture"
           description="Sotware-, Cluster- and Multi Cluster Architecture"