diff --git a/advanced/fiori.md b/advanced/fiori.md
index 2cc613ace..d671a6018 100644
--- a/advanced/fiori.md
+++ b/advanced/fiori.md
@@ -25,63 +25,35 @@ This guide explains how to add one or more SAP Fiori elements apps to a CAP proj
For entities exposed via OData V4 there is a _Fiori preview_ link on the index page. It dynamically serves an SAP Fiori Elements list page that allows you to quickly see the effect of annotation changes without having to create a UI application first.
-
-
::: details Be aware that this is **not meant for production**.
+
+
The preview not meant as a replacement for a proper SAP Fiori Elements (UI5) application.
It is only active locally where the [development profile](../node.js/cds-env#profiles) is enabled.
-To also enable it in cloud deployments, for test or demo purposes maybe, add the following configuration:
-
-::: code-group
-
-```json [package.json]
-{
- "cds": {
- "features": {
- "fiori_preview": true
- }
- }
-}
-```
-```json [.cdsrc.json]
-{
- "features": {
- "fiori_preview": true
- }
-}
-```
-
-:::
+To also enable it in cloud deployments, for test or demo purposes maybe, set cds.fiori.preview:true.
-::: details Be aware that this is **not meant for production**.
-
The preview not meant as a replacement for a proper SAP Fiori Elements (UI5) application.
It is active by default, but disabled automatically in case the [production profile](../java/developing-applications/configuring#production-profile) is enabled.
-To also enable it in cloud deployments, for test or demo purposes maybe, add the following configuration:
+To also enable it in cloud deployments, for test or demo purposes maybe, set cds.index-page.enabled:true.
+
+
-::: code-group
-```yaml [srv/src/main/resources/application.yaml]
-cds:
- index-page:
- enabled: true
-```
:::
-
## Adding Fiori Apps
As showcased in [cap/samples](https://github.com/sap-samples/cloud-cap-samples/tree/main/fiori/app), SAP Fiori apps should be added as sub folders to the `app/` of a CAP project. Each sub folder constitutes an individual SAP Fiori application, with [local annotations](#fiori-annotations), _manifest.json_, etc. So, a typical folder layout would look like this:
-| Folder/Sub Folder | Description |
+| Folder/Sub Folder | Description |
|----------------------------|--------------------------------------|
| `app/` | All SAP Fiori apps should go in here |
| `browse/` | SAP Fiori app for end users |
@@ -97,9 +69,12 @@ Links to Fiori applications created in the `app/` folder are automatically added
### Using SAP Fiori Tools
-The SAP Fiori tools provide advanced support for adding SAP Fiori apps to existing CAP projects as well as a wealth of productivity tools, for example for adding SAP Fiori annotations, or graphical modeling and editing. They can be used locally in [Visual Studio Code (VS Code)](https://marketplace.visualstudio.com/items?itemName=SAPSE.sap-ux-fiori-tools-extension-pack) or in [SAP Business Application Studio](https://help.sap.com/docs/SAP_FIORI_tools/17d50220bcd848aa854c9c182d65b699/b0110400b44748d7b844bb5977a657fa.html).
+The SAP Fiori tools provide advanced support for [adding SAP Fiori apps](https://help.sap.com/docs/SAP_FIORI_tools/17d50220bcd848aa854c9c182d65b699/db44d45051794d778f1dd50def0fa267.html) to existing CAP projects as well as a wealth of productivity tools, for example for adding SAP Fiori annotations, or graphical modeling and editing. They can be used locally in [Visual Studio Code (VS Code)](https://marketplace.visualstudio.com/items?itemName=SAPSE.sap-ux-fiori-tools-extension-pack) or in [SAP Business Application Studio](https://help.sap.com/docs/SAP_FIORI_tools/17d50220bcd848aa854c9c182d65b699/b0110400b44748d7b844bb5977a657fa.html).
+
-[Learn more about **how to install SAP Fiori tools**.](https://help.sap.com/docs/SAP_FIORI_tools/17d50220bcd848aa854c9c182d65b699/2d8b1cb11f6541e5ab16f05461c64201.html){.learn-more}
+### Using [`cds add`](../tools/cds-cli#sample)
+
+Use `cds add sample` to add Fiori sample code to an existing project, or create a new one with `cds init