diff --git a/get-started/troubleshooting.md b/get-started/troubleshooting.md
index 198ee3bee2..9e4c539091 100644
--- a/get-started/troubleshooting.md
+++ b/get-started/troubleshooting.md
@@ -397,11 +397,24 @@ On trial, your SAP HANA Cloud instance will be automatically stopped overnight,
 | _Root Cause_ | SAP HANA still claims exclusive ownership of the data that was once deployed through `hdbtabledata` artifacts, even though the CSV files are now deleted in your project.
 | _Solution_ | Add an _undeploy.json_ file to the root of your database module (the _db_ folder by default). This file defines the files **and data** to be deleted. See section [HDI Delta Deployment and Undeploy Allow List](https://help.sap.com/docs/HANA_CLOUD_DATABASE/c2b99f19e9264c4d9ae9221b22f6f589/ebb0a1d1d41e4ab0a06ea951717e7d3d.html) for more details.
 
-::: tip
-If you want to keep the data from _.csv_ files and data you've already added, see [SAP Note 2922271](https://me.sap.com/notes/2922271) for more details.
+
+#### How do I keep existing data?
+If you want to keep the data from _.csv_ files and data you've already added, apply [SAP Note 2922271](https://me.sap.com/notes/2922271).
+Depending on whether you have a single-tenant or multi-tenant application, see the following details for how to set the `path_parameter` and `undeploy` parameters:
+
+:::details Single-tenant applications {open}
+
+Use the _db/undeploy.json_ file as given in the SAP note.
+The _package.json_ file that is mentioned in the SAP note is located in the _db/_ folder.
+- If you don't find a _db/package.json_ file, use _gen/db/package.json_ (created by `cds build`) as a template and copy it to _db/package.json_.
+- After the modification, run `cds build --production` and verify your changes have been copied to _gen/db/package.json_.
+- Don't modify _gen/db/package.json_ as it is overwritten on every build.
+
 :::
 
-You can apply this solution also when using the `cds-mtxs` library. You can either set the options via the environment variable [`HDI_DEPLOY_OPTIONS`](https://help.sap.com/docs/SAP_HANA_PLATFORM/4505d0bdaf4948449b7f7379d24d0f0d/a4bbc2dd8a20442387dc7b706e8d3070.html), the CDS configuration or you can add them to the model update request as `hdi` parameter:
+:::details Multi-tenant applications
+
+Instead of configuring the static deployer application in _db/package.json_, use environment variable [`HDI_DEPLOY_OPTIONS`](https://help.sap.com/docs/SAP_HANA_PLATFORM/4505d0bdaf4948449b7f7379d24d0f0d/a4bbc2dd8a20442387dc7b706e8d3070.html), the `cds` configuration in _package.json_, or add the options to the model update request as `hdi` parameter:
 
 CDS configuration for [Deployment Service](../guides/multitenancy/mtxs#deployment-config)
 ```json
@@ -439,6 +452,11 @@ Options in [Saas Provisioning Service upgrade API](../guides/multitenancy/mtxs#e
 }
 ```
 
+:::
+
+After you have successfully deployed these changes to all affected HDI (tenant) containers (in all spaces, accounts etc.), you can remove the configuration again.
+
+
 ### How Do I Resolve Deployment Errors?
 
 #### Deployment fails — _Cyclic dependencies found_ or _Cycle between files_