diff --git a/sample-extension-java/Makefile b/sample-extension-java/Makefile
index 68aae102..0736e37e 100644
--- a/sample-extension-java/Makefile
+++ b/sample-extension-java/Makefile
@@ -1,4 +1,4 @@
-RELEASE?=0.0.23
+RELEASE?=0.0.24
 APP?=sample-extension-java
 DOCKER_ACCOUNT?=gauravsap
 CONTAINER_IMAGE?=${DOCKER_ACCOUNT}/${APP}:${RELEASE}
diff --git a/sample-extension-java/build.gradle b/sample-extension-java/build.gradle
index 349a321c..32403a53 100644
--- a/sample-extension-java/build.gradle
+++ b/sample-extension-java/build.gradle
@@ -1,12 +1,14 @@
 plugins {
-    id 'org.springframework.boot' version '2.6.3'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'org.springframework.boot' version '3.2.3'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'java'
 }
 
 group = 'com.sap.kyma.sample'
-sourceCompatibility = '17'
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+}
 repositories {
     mavenCentral()
 }
@@ -14,7 +16,7 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-data-rest'
-    implementation 'javax.validation:validation-api'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     runtimeOnly 'com.h2database:h2'
     testImplementation('org.springframework.boot:spring-boot-starter-test') {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
diff --git a/sample-extension-java/gradle/wrapper/gradle-wrapper.jar b/sample-extension-java/gradle/wrapper/gradle-wrapper.jar
index 7454180f..943f0cbf 100644
Binary files a/sample-extension-java/gradle/wrapper/gradle-wrapper.jar and b/sample-extension-java/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/sample-extension-java/gradle/wrapper/gradle-wrapper.properties b/sample-extension-java/gradle/wrapper/gradle-wrapper.properties
index 070cb702..509c4a29 100644
--- a/sample-extension-java/gradle/wrapper/gradle-wrapper.properties
+++ b/sample-extension-java/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample-extension-java/gradlew b/sample-extension-java/gradlew
index 1b6c7873..65dcd68d 100755
--- a/sample-extension-java/gradlew
+++ b/sample-extension-java/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/sample-extension-java/gradlew.bat b/sample-extension-java/gradlew.bat
index ac1b06f9..6689b85b 100644
--- a/sample-extension-java/gradlew.bat
+++ b/sample-extension-java/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/dao/OrdersRepository.java b/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/dao/OrdersRepository.java
index 4aed6b15..cd3254da 100644
--- a/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/dao/OrdersRepository.java
+++ b/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/dao/OrdersRepository.java
@@ -1,11 +1,12 @@
 package com.sap.kyma.sample.orders.dao;
 
 import com.sap.kyma.sample.orders.domain.model.Order;
+import jakarta.transaction.Transactional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
-import javax.transaction.Transactional;
+
 
 public interface OrdersRepository extends JpaRepository<Order, Long> {
 
diff --git a/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/command/CreateOrder.java b/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/command/CreateOrder.java
index c6d0cf47..3a4e1155 100644
--- a/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/command/CreateOrder.java
+++ b/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/command/CreateOrder.java
@@ -1,6 +1,7 @@
 package com.sap.kyma.sample.orders.domain.command;
 
-import javax.validation.constraints.NotBlank;
+
+import jakarta.validation.constraints.NotBlank;
 
 public class CreateOrder {
 
diff --git a/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/command/UpdateOrder.java b/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/command/UpdateOrder.java
index be088b0b..b153243f 100644
--- a/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/command/UpdateOrder.java
+++ b/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/command/UpdateOrder.java
@@ -1,6 +1,6 @@
 package com.sap.kyma.sample.orders.domain.command;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 public class UpdateOrder {
     @NotBlank
diff --git a/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/model/Order.java b/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/model/Order.java
index 557b70fd..38578e51 100644
--- a/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/model/Order.java
+++ b/sample-extension-java/src/main/java/com/sap/kyma/sample/orders/domain/model/Order.java
@@ -4,7 +4,7 @@
 import com.sap.kyma.sample.orders.domain.command.CreateOrder;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 import static org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME;
diff --git a/sample-extension-java/src/test/java/com/sap/kyma/sample/orders/OrdersApplicationTests.java b/sample-extension-java/src/test/java/com/sap/kyma/sample/orders/OrdersApplicationTests.java
index 3d252d11..b7b93da8 100644
--- a/sample-extension-java/src/test/java/com/sap/kyma/sample/orders/OrdersApplicationTests.java
+++ b/sample-extension-java/src/test/java/com/sap/kyma/sample/orders/OrdersApplicationTests.java
@@ -67,7 +67,7 @@ private void verifyGet(Order respObj) {
 
     private Order verifyCreate(CreateOrder order) throws JSONException {
         HttpEntity<String> requestBody = map(order);
-        Order respObj = restTemplate.postForObject(BASE_PATH + "/", requestBody, Order.class);
+        Order respObj = restTemplate.postForObject(BASE_PATH , requestBody, Order.class);
         assertThat(respObj.getCreated()).isNotNull();
         assertThat(respObj.getDescription()).isEqualTo(order.getDescription());
         assertThat(respObj.getOrderId()).isNotNull();