diff -Nru ca-certificates-java-20230103/debian/ca-certificates-java.postinst ca-certificates-java-20230103ubuntu1/debian/ca-certificates-java.postinst
--- ca-certificates-java-20230103/debian/ca-certificates-java.postinst	2023-01-03 21:10:44.000000000 +1300
+++ ca-certificates-java-20230103ubuntu1/debian/ca-certificates-java.postinst	2023-03-01 13:31:58.000000000 +1300
@@ -18,30 +18,6 @@
 ETCCERTSDIR=/etc/ssl/certs
 CACERTS=$ETCCERTSDIR/java/cacerts

-setup_path()
-{
-	for version in 8 9 10 11 12 13 14 15 16 17 18 19 20 21 ; do
-		for jvm in \
-			java-${version}-openjdk-${arch} \
-			java-${version}-openjdk \
-			oracle-java${version}-jre-${arch} \
-			oracle-java${version}-server-jre-${arch} \
-			oracle-java${version}-jdk-${arch}
-		do
-			if [ -x /usr/lib/jvm/$jvm/bin/java ]; then
-				export JAVA_HOME=/usr/lib/jvm/$jvm
-				PATH=$JAVA_HOME/bin:$PATH
-				break 2
-			fi
-		done
-	done
-
-	if ! which java >/dev/null; then
-		echo "No JRE found. Skipping Java certificates setup."
-		exit 0
-	fi
-}
-
 check_proc()
 {
     if ! mountpoint -q /proc; then
@@ -90,7 +66,10 @@
 		exit 0
 	fi

-	setup_path
+	if ! which java >/dev/null; then
+		echo "No JRE found. Skipping Java certificates setup."
+		exit 0
+	fi

 	if [ -f /var/lib/ca-certificates-java/convert_pkcs12_keystore_to_jks ]; then
 		convert_pkcs12_keystore_to_jks
@@ -103,7 +82,17 @@

 		if [ -f "$CACERTS" ]; then
 			check_proc
-			cacerts_aliases=$(keytool -cacerts -storepass "$storepass" -list -rfc | sed -n 's/^Alias name: *debian://ip' | tr '\n' ' ')
+
+			# Java 8 does not have -cacerts option
+			if java -version 2>&1 | grep "1.8" > /dev/null ;
+			then
+				castore="-keystore ${CACERTS}"
+			else
+				castore="-cacerts"
+			fi
+
+			cacerts_aliases=$(keytool ${castore} -storepass "$storepass" -list -rfc | sed -n 's/^Alias name: *debian://ip' | tr '\n' ' ')
+
 			etc_ssl_certs_aliases=$(for pem in $pem_files ; do echo -n "$(basename "$pem" | tr A-Z a-z) "; done)
 			for alias in $cacerts_aliases ; do
 				case " $etc_ssl_certs_aliases " in
@@ -177,5 +166,9 @@
 			;;
 	esac

+	if [ ! -f $CACERTS ]; then
+		touch /var/lib/ca-certificates-java/fresh
+	fi
+
 	update_cacerts
 fi
diff -Nru ca-certificates-java-20230103/debian/ca-certificates-java.triggers ca-certificates-java-20230103ubuntu1/debian/ca-certificates-java.triggers
--- ca-certificates-java-20230103/debian/ca-certificates-java.triggers	2023-01-03 21:10:44.000000000 +1300
+++ ca-certificates-java-20230103ubuntu1/debian/ca-certificates-java.triggers	2023-03-01 13:31:58.000000000 +1300
@@ -1,3 +1,2 @@
-interest update-ca-certificates-java
-interest update-ca-certificates-java-fresh
-interest /usr/lib/jvm
+interest-await update-ca-certificates-java
+interest-await update-ca-certificates-java-fresh
diff -Nru ca-certificates-java-20230103/debian/control ca-certificates-java-20230103ubuntu1/debian/control
--- ca-certificates-java-20230103/debian/control	2023-01-03 21:10:44.000000000 +1300
+++ ca-certificates-java-20230103ubuntu1/debian/control	2023-03-01 13:31:58.000000000 +1300
@@ -20,7 +20,13 @@
 Depends:
  ca-certificates (>= 20210120),
  ${misc:Depends},
- default-jre-headless (>= 2:1.8) | java8-runtime-headless,
+Breaks: openjdk-8-jre-headless  (<<8u362-ga-0ubuntu2~),
+        openjdk-11-jre-headless (<<11.0.18+10-0ubuntu3~),
+        openjdk-17-jre-headless (<<17.0.6+10-1ubuntu1~),
+        openjdk-18-jre-headless (<<18.0.2+9-2ubuntu1~),
+        openjdk-19-jre-headless (<<19.0.2+7-0ubuntu4~),
+        openjdk-20-jre-headless (<<20~26ea-1ubuntu1~),
+        openjdk-21-jre-headless (<<21~7ea-1ubuntu1~)
 Description: Common CA certificates (JKS keystore)
  This package uses the hooks of the ca-certificates package to update the
  cacerts JKS keystore used for many java runtimes.
diff -Nru ca-certificates-java-20230103/debian/tests/can-convert-keystore ca-certificates-java-20230103ubuntu1/debian/tests/can-convert-keystore
--- ca-certificates-java-20230103/debian/tests/can-convert-keystore	1970-01-01 12:00:00.000000000 +1200
+++ ca-certificates-java-20230103ubuntu1/debian/tests/can-convert-keystore	2023-03-01 13:31:58.000000000 +1300
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+# GIVEN a PKCS12 Java keystore
+ETCCERTSDIR=/etc/ssl/certs
+CACERTS=$ETCCERTSDIR/java/cacerts
+rm $CACERTS
+keytool -importcert -noprompt -alias Amazon -file /etc/ssl/certs/Amazon_Root_CA_1.pem -trustcacerts -storepass changeit -storetype PKCS12 -keystore test.store 2> /dev/null
+apt-get remove -y ca-certificates-java
+
+mkdir -p /etc/ssl/certs/java/
+mkdir -p /var/lib/ca-certificates-java/
+mv test.store $CACERTS
+# WHEN ca-certificates-java is requested to convert the keystore
+touch /var/lib/ca-certificates-java/convert_pkcs12_keystore_to_jks
+
+# THEN conversion is successful
+output=`mktemp`
+apt-get install -y openjdk-8-jre-headless | tee ${output}
+
+if [[ $(grep -L "Entry for alias amazon successfully imported." ${output}) ]];
+then
+    echo "Certificates were not imported !!!"
+    exit 255
+fi
diff -Nru ca-certificates-java-20230103/debian/tests/can-install-jre ca-certificates-java-20230103ubuntu1/debian/tests/can-install-jre
--- ca-certificates-java-20230103/debian/tests/can-install-jre	1970-01-01 12:00:00.000000000 +1200
+++ ca-certificates-java-20230103ubuntu1/debian/tests/can-install-jre	2023-03-01 13:31:58.000000000 +1300
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e
+versions=$(apt-cache search jre-headless | awk '{print $1}')
+for version in ${versions}
+do
+# WHEN openjdk-jre-headless package is installed from scratch
+
+    # Java 18 is EOL 09.2022 but is present in Lunar so that we could do clean
+    # builds. Ignore it in certificate tests
+    if [[ ${version} == "openjdk-18-jre-headless" ]];
+    then
+        continue
+    fi
+    output=`mktemp`
+    echo "installing ${version}"
+    apt-get install -y ${version} | tee ${output}
+# THEN installation is successfull
+# AND certificates are updated
+    if [[ $(grep -L "Adding debian:Amazon_Root_CA_1.pem" ${output}) ]]; then
+        echo "Certificates were not imported !!!"
+        exit 255
+    fi
+    rm $output
+    # purge in order to remove keytstore
+    apt-get purge -y ca-certificates-java ${version}
+done
\ No newline at end of file
diff -Nru ca-certificates-java-20230103/debian/tests/can-install-libreoffice ca-certificates-java-20230103ubuntu1/debian/tests/can-install-libreoffice
--- ca-certificates-java-20230103/debian/tests/can-install-libreoffice	1970-01-01 12:00:00.000000000 +1200
+++ ca-certificates-java-20230103ubuntu1/debian/tests/can-install-libreoffice	2023-03-01 13:31:58.000000000 +1300
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+apt-get install -y libreoffice
\ No newline at end of file
diff -Nru ca-certificates-java-20230103/debian/tests/can-install-multiple-jdks ca-certificates-java-20230103ubuntu1/debian/tests/can-install-multiple-jdks
--- ca-certificates-java-20230103/debian/tests/can-install-multiple-jdks	1970-01-01 12:00:00.000000000 +1200
+++ ca-certificates-java-20230103ubuntu1/debian/tests/can-install-multiple-jdks	2023-03-01 13:31:58.000000000 +1300
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+output=`mktemp`
+# WHEN multiple JDKs are installed
+apt-get install -y openjdk-11-jdk openjdk-17-jdk openjdk-8-jdk | tee ${output}
+
+# THEN installation is successful
+if [[ $(grep -L "Adding debian:Amazon_Root_CA_1.pem" ${output}) ]]; then
+    echo "Certificates were not imported !!!"
+    exit 255
+fi
+rm $output
diff -Nru ca-certificates-java-20230103/debian/tests/control ca-certificates-java-20230103ubuntu1/debian/tests/control
--- ca-certificates-java-20230103/debian/tests/control	1970-01-01 12:00:00.000000000 +1200
+++ ca-certificates-java-20230103ubuntu1/debian/tests/control	2023-03-01 13:31:58.000000000 +1300
@@ -0,0 +1,9 @@
+Tests: can-convert-keystore
+Depends: default-jre-headless
+Restrictions: needs-root
+
+Tests: can-install-jre, can-install-multiple-jdks, can-install-libreoffice
+# No depends, this is a test for a clean install
+Depends:
+Restrictions: needs-root
+