diff --git a/tomcat-9.0-digest.script b/tomcat-9.0-digest.script
index fae10b3..2f3cacf 100644
--- a/tomcat-9.0-digest.script
+++ b/tomcat-9.0-digest.script
@@ -3,6 +3,9 @@
 # tomcat-digest script
 # JPackage Project <http://www.jpackage.org/>
 
+# Set default JAVA_HOME
+export JAVA_HOME="${JAVA_HOME:-%{?java_home}}"
+
 # Source functions library
 if [ -f /usr/share/java-utils/java-functions ] ; then
   . /usr/share/java-utils/java-functions
diff --git a/tomcat-9.0-tool-wrapper.script b/tomcat-9.0-tool-wrapper.script
index 9ab51c6..a342e17 100644
--- a/tomcat-9.0-tool-wrapper.script
+++ b/tomcat-9.0-tool-wrapper.script
@@ -3,6 +3,9 @@
 # tomcat-digest script
 # JPackage Project <http://www.jpackage.org/>
 
+# Set default JAVA_HOME
+export JAVA_HOME="${JAVA_HOME:-%{?java_home}}"
+
 # Source functions library
 if [ -f /usr/share/java-utils/java-functions ] ; then
   . /usr/share/java-utils/java-functions
diff --git a/tomcat.changes b/tomcat.changes
index ab3bb21..7b25b72 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct  3 13:17:03 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Adapt the scripts to run also with javapackages-tools >= 6.3
+
 -------------------------------------------------------------------
 Sun Sep 29 19:42:03 UTC 2024 - Fridrich Strba <fstrba@suse.com>