diff --git a/code/easyfranchise/source/backend/db-service/src/main/java/dev/kyma/samples/easyfranchise/dbservice/DB.java b/code/easyfranchise/source/backend/db-service/src/main/java/dev/kyma/samples/easyfranchise/dbservice/DB.java
index 79164c2..772e3a3 100644
--- a/code/easyfranchise/source/backend/db-service/src/main/java/dev/kyma/samples/easyfranchise/dbservice/DB.java
+++ b/code/easyfranchise/source/backend/db-service/src/main/java/dev/kyma/samples/easyfranchise/dbservice/DB.java
@@ -244,7 +244,7 @@ public static String onboard(String tenantId, TenantInfo tenantInfo) {
             
             // create user and schema
             emAdmin.getTransaction().begin();     
-            Query q = emAdmin.createNativeQuery("CREATE USER " + schema + " PASSWORD " + tenant.getPassword() + " NO FORCE_FIRST_PASSWORD_CHANGE;");
+            Query q = emAdmin.createNativeQuery("CREATE USER " + schema + " PASSWORD \"" + tenant.getPassword() + "\" NO FORCE_FIRST_PASSWORD_CHANGE;");
             q.executeUpdate();
             q = emAdmin.createNativeQuery("ALTER USER " + schema + " DISABLE PASSWORD LIFETIME;");
             q.executeUpdate();
diff --git a/documentation/prepare/set-up-local-environment/README.md b/documentation/prepare/set-up-local-environment/README.md
index ba66729..118e81b 100644
--- a/documentation/prepare/set-up-local-environment/README.md
+++ b/documentation/prepare/set-up-local-environment/README.md
@@ -2,7 +2,7 @@
 
 To execute all the necessary steps of the tutorial, you will need the following software available on your machine:
 
-* Java: JDK16 or later. We recommend [OpenJDK](https://openjdk.java.net/install/).
+* Java: JDK17 or later. We recommend [OpenJDK](https://openjdk.java.net/install/).
 * [Maven](https://maven.apache.org/install.html)
 * [Node.js](https://nodejs.org/en/download/)
 * [Docker](https://hub.docker.com/)
@@ -23,7 +23,7 @@ If you have chosen to use the Linux, you need to choose the Linux installation o
 
 ### Java - Java Development Kit
 
-You can choose any JDK provider that you prefer. We recommend using [OpenJDK](https://openjdk.java.net/install/). Make sure that you have at least JDK16 installed.
+You can choose any JDK provider that you prefer. We recommend using [OpenJDK](https://openjdk.java.net/install/). Make sure that you have at least JDK17 installed.
 
 To verify your installation, type the following in a shell:
 
@@ -72,7 +72,7 @@ node -v
 The output should look like this:
 
 ```shell
-v12.21.0
+v21.1.0
 ```
 
 ## Deployment to Kyma
diff --git a/documentation/prepare/test-app-locally/README.md b/documentation/prepare/test-app-locally/README.md
index 5f997a1..ede598f 100644
--- a/documentation/prepare/test-app-locally/README.md
+++ b/documentation/prepare/test-app-locally/README.md
@@ -63,7 +63,7 @@ For your local run, you have to configure some properties in a `hiddenconfig.pro
 ### Build
 
 Build the project:
-1. Open a command line window and change to directory to [code/easyfranchise/source/backend](../../../code/easyfranchise/source/backend) containing the main [pom.xml](../../../code/easyfranchise/source/backend/pom.xml). Be sure to update the JDK version in the pom.xml (lign 23) if you are not using JDK15. Then run the following Maven command:
+1. Open a command line window and change to directory to [code/easyfranchise/source/backend](../../../code/easyfranchise/source/backend) containing the main [pom.xml](../../../code/easyfranchise/source/backend/pom.xml). Be sure to update the JDK version in the pom.xml (lign 23) if you are not using JDK17. Then run the following Maven command:
 
    ```mvn clean install```
 
@@ -141,14 +141,13 @@ Windows users have to rely on unix-like shells to execute the curl commands we p
 
    * return status: `200 OK`
    * content: ``[]``
-   * ![](images/2023-getTenants01.png)
 
    The first run will take a bit longer than the next one, as database table creation has to be carried out.
 
 2. Let's have a look into table data of our database:
    - In the **Instance** overview select your SAP HANA Database, expand the "..." and select **Open in SAP HANA Database Explorer**. Provide Database user and password.
 
-     ![](images/openSAPHANADBExplorer.png)
+     ![](images/2023-getTenants01.png)
    - Expand the **Catalog** and select **Tables**.
    - Find the newly created table **TENANT** and open via Context Menu *Open Data*. No records exist yet.