diff --git a/11/jdk/alpine/entrypoint.sh b/11/jdk/alpine/entrypoint.sh
index c3f02618..306dd4c3 100755
--- a/11/jdk/alpine/entrypoint.sh
+++ b/11/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/11/jdk/ubi/ubi9-minimal/entrypoint.sh b/11/jdk/ubi/ubi9-minimal/entrypoint.sh
index 09be1167..c00c0328 100755
--- a/11/jdk/ubi/ubi9-minimal/entrypoint.sh
+++ b/11/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/11/jdk/ubuntu/focal/entrypoint.sh b/11/jdk/ubuntu/focal/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/11/jdk/ubuntu/focal/entrypoint.sh
+++ b/11/jdk/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/11/jdk/ubuntu/jammy/entrypoint.sh b/11/jdk/ubuntu/jammy/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/11/jdk/ubuntu/jammy/entrypoint.sh
+++ b/11/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/11/jdk/ubuntu/noble/entrypoint.sh b/11/jdk/ubuntu/noble/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/11/jdk/ubuntu/noble/entrypoint.sh
+++ b/11/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/11/jre/alpine/entrypoint.sh b/11/jre/alpine/entrypoint.sh
index c3f02618..306dd4c3 100755
--- a/11/jre/alpine/entrypoint.sh
+++ b/11/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/11/jre/ubi/ubi9-minimal/entrypoint.sh b/11/jre/ubi/ubi9-minimal/entrypoint.sh
index 09be1167..c00c0328 100755
--- a/11/jre/ubi/ubi9-minimal/entrypoint.sh
+++ b/11/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/11/jre/ubuntu/focal/entrypoint.sh b/11/jre/ubuntu/focal/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/11/jre/ubuntu/focal/entrypoint.sh
+++ b/11/jre/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/11/jre/ubuntu/jammy/entrypoint.sh b/11/jre/ubuntu/jammy/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/11/jre/ubuntu/jammy/entrypoint.sh
+++ b/11/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/11/jre/ubuntu/noble/entrypoint.sh b/11/jre/ubuntu/noble/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/11/jre/ubuntu/noble/entrypoint.sh
+++ b/11/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/17/jdk/alpine/entrypoint.sh b/17/jdk/alpine/entrypoint.sh
index c3f02618..306dd4c3 100755
--- a/17/jdk/alpine/entrypoint.sh
+++ b/17/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/17/jdk/ubi/ubi9-minimal/entrypoint.sh b/17/jdk/ubi/ubi9-minimal/entrypoint.sh
index 09be1167..c00c0328 100755
--- a/17/jdk/ubi/ubi9-minimal/entrypoint.sh
+++ b/17/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/17/jdk/ubuntu/focal/entrypoint.sh b/17/jdk/ubuntu/focal/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/17/jdk/ubuntu/focal/entrypoint.sh
+++ b/17/jdk/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/17/jdk/ubuntu/jammy/entrypoint.sh b/17/jdk/ubuntu/jammy/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/17/jdk/ubuntu/jammy/entrypoint.sh
+++ b/17/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/17/jdk/ubuntu/noble/entrypoint.sh b/17/jdk/ubuntu/noble/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/17/jdk/ubuntu/noble/entrypoint.sh
+++ b/17/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/17/jre/alpine/entrypoint.sh b/17/jre/alpine/entrypoint.sh
index c3f02618..306dd4c3 100755
--- a/17/jre/alpine/entrypoint.sh
+++ b/17/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/17/jre/ubi/ubi9-minimal/entrypoint.sh b/17/jre/ubi/ubi9-minimal/entrypoint.sh
index 09be1167..c00c0328 100755
--- a/17/jre/ubi/ubi9-minimal/entrypoint.sh
+++ b/17/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/17/jre/ubuntu/focal/entrypoint.sh b/17/jre/ubuntu/focal/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/17/jre/ubuntu/focal/entrypoint.sh
+++ b/17/jre/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/17/jre/ubuntu/jammy/entrypoint.sh b/17/jre/ubuntu/jammy/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/17/jre/ubuntu/jammy/entrypoint.sh
+++ b/17/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/17/jre/ubuntu/noble/entrypoint.sh b/17/jre/ubuntu/noble/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/17/jre/ubuntu/noble/entrypoint.sh
+++ b/17/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/21/jdk/alpine/entrypoint.sh b/21/jdk/alpine/entrypoint.sh
index c3f02618..306dd4c3 100755
--- a/21/jdk/alpine/entrypoint.sh
+++ b/21/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/21/jdk/ubi/ubi9-minimal/entrypoint.sh b/21/jdk/ubi/ubi9-minimal/entrypoint.sh
index 09be1167..c00c0328 100755
--- a/21/jdk/ubi/ubi9-minimal/entrypoint.sh
+++ b/21/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/21/jdk/ubuntu/jammy/entrypoint.sh b/21/jdk/ubuntu/jammy/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/21/jdk/ubuntu/jammy/entrypoint.sh
+++ b/21/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/21/jdk/ubuntu/noble/entrypoint.sh b/21/jdk/ubuntu/noble/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/21/jdk/ubuntu/noble/entrypoint.sh
+++ b/21/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/21/jre/alpine/entrypoint.sh b/21/jre/alpine/entrypoint.sh
index c3f02618..306dd4c3 100755
--- a/21/jre/alpine/entrypoint.sh
+++ b/21/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/21/jre/ubi/ubi9-minimal/entrypoint.sh b/21/jre/ubi/ubi9-minimal/entrypoint.sh
index 09be1167..c00c0328 100755
--- a/21/jre/ubi/ubi9-minimal/entrypoint.sh
+++ b/21/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/21/jre/ubuntu/jammy/entrypoint.sh b/21/jre/ubuntu/jammy/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/21/jre/ubuntu/jammy/entrypoint.sh
+++ b/21/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/21/jre/ubuntu/noble/entrypoint.sh b/21/jre/ubuntu/noble/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/21/jre/ubuntu/noble/entrypoint.sh
+++ b/21/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/22/jdk/alpine/entrypoint.sh b/22/jdk/alpine/entrypoint.sh
index c3f02618..306dd4c3 100755
--- a/22/jdk/alpine/entrypoint.sh
+++ b/22/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/22/jdk/ubi/ubi9-minimal/entrypoint.sh b/22/jdk/ubi/ubi9-minimal/entrypoint.sh
index 09be1167..c00c0328 100755
--- a/22/jdk/ubi/ubi9-minimal/entrypoint.sh
+++ b/22/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/22/jdk/ubuntu/jammy/entrypoint.sh b/22/jdk/ubuntu/jammy/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/22/jdk/ubuntu/jammy/entrypoint.sh
+++ b/22/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/22/jdk/ubuntu/noble/entrypoint.sh b/22/jdk/ubuntu/noble/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/22/jdk/ubuntu/noble/entrypoint.sh
+++ b/22/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/22/jre/alpine/entrypoint.sh b/22/jre/alpine/entrypoint.sh
index c3f02618..306dd4c3 100755
--- a/22/jre/alpine/entrypoint.sh
+++ b/22/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/22/jre/ubi/ubi9-minimal/entrypoint.sh b/22/jre/ubi/ubi9-minimal/entrypoint.sh
index 09be1167..c00c0328 100755
--- a/22/jre/ubi/ubi9-minimal/entrypoint.sh
+++ b/22/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/22/jre/ubuntu/jammy/entrypoint.sh b/22/jre/ubuntu/jammy/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/22/jre/ubuntu/jammy/entrypoint.sh
+++ b/22/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/22/jre/ubuntu/noble/entrypoint.sh b/22/jre/ubuntu/noble/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/22/jre/ubuntu/noble/entrypoint.sh
+++ b/22/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/8/jdk/alpine/entrypoint.sh b/8/jdk/alpine/entrypoint.sh
index c3f02618..25253b7d 100755
--- a/8/jdk/alpine/entrypoint.sh
+++ b/8/jdk/alpine/entrypoint.sh
@@ -26,12 +26,8 @@ set -e
 TMPDIR=${TMPDIR:-/tmp}
 
 # JDK truststore location
-JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
-
 # JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
+JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
 
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
diff --git a/8/jdk/ubi/ubi9-minimal/entrypoint.sh b/8/jdk/ubi/ubi9-minimal/entrypoint.sh
index 09be1167..9e444333 100755
--- a/8/jdk/ubi/ubi9-minimal/entrypoint.sh
+++ b/8/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -26,12 +26,8 @@ set -e
 TMPDIR=${TMPDIR:-/tmp}
 
 # JDK truststore location
-JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
-
 # JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
+JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
 
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
diff --git a/8/jdk/ubuntu/focal/entrypoint.sh b/8/jdk/ubuntu/focal/entrypoint.sh
index 2d204046..129e5ccc 100755
--- a/8/jdk/ubuntu/focal/entrypoint.sh
+++ b/8/jdk/ubuntu/focal/entrypoint.sh
@@ -26,12 +26,8 @@ set -e
 TMPDIR=${TMPDIR:-/tmp}
 
 # JDK truststore location
-JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
-
 # JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
+JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
 
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
diff --git a/8/jdk/ubuntu/jammy/entrypoint.sh b/8/jdk/ubuntu/jammy/entrypoint.sh
index 2d204046..129e5ccc 100755
--- a/8/jdk/ubuntu/jammy/entrypoint.sh
+++ b/8/jdk/ubuntu/jammy/entrypoint.sh
@@ -26,12 +26,8 @@ set -e
 TMPDIR=${TMPDIR:-/tmp}
 
 # JDK truststore location
-JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
-
 # JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
+JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
 
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
diff --git a/8/jdk/ubuntu/noble/entrypoint.sh b/8/jdk/ubuntu/noble/entrypoint.sh
index 2d204046..129e5ccc 100755
--- a/8/jdk/ubuntu/noble/entrypoint.sh
+++ b/8/jdk/ubuntu/noble/entrypoint.sh
@@ -26,12 +26,8 @@ set -e
 TMPDIR=${TMPDIR:-/tmp}
 
 # JDK truststore location
-JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
-
 # JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
+JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
 
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
diff --git a/8/jre/alpine/entrypoint.sh b/8/jre/alpine/entrypoint.sh
index c3f02618..306dd4c3 100755
--- a/8/jre/alpine/entrypoint.sh
+++ b/8/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/8/jre/ubi/ubi9-minimal/entrypoint.sh b/8/jre/ubi/ubi9-minimal/entrypoint.sh
index 09be1167..c00c0328 100755
--- a/8/jre/ubi/ubi9-minimal/entrypoint.sh
+++ b/8/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/8/jre/ubuntu/focal/entrypoint.sh b/8/jre/ubuntu/focal/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/8/jre/ubuntu/focal/entrypoint.sh
+++ b/8/jre/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/8/jre/ubuntu/jammy/entrypoint.sh b/8/jre/ubuntu/jammy/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/8/jre/ubuntu/jammy/entrypoint.sh
+++ b/8/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/8/jre/ubuntu/noble/entrypoint.sh b/8/jre/ubuntu/noble/entrypoint.sh
index 2d204046..d51059c1 100755
--- a/8/jre/ubuntu/noble/entrypoint.sh
+++ b/8/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 
diff --git a/docker_templates/entrypoint.sh.j2 b/docker_templates/entrypoint.sh.j2
index 4e4baac2..6825f5a9 100755
--- a/docker_templates/entrypoint.sh.j2
+++ b/docker_templates/entrypoint.sh.j2
@@ -13,12 +13,12 @@ set -e
 TMPDIR=${TMPDIR:-/tmp}
 
 # JDK truststore location
-JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
-
+{%- if version|int == 8 and image_type == "jdk" %}
 # JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
+JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
+{%- else %}
+JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
+{%- endif %}
 
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
diff --git a/generate_dockerfiles.py b/generate_dockerfiles.py
index d4007cd1..280643be 100644
--- a/generate_dockerfiles.py
+++ b/generate_dockerfiles.py
@@ -180,7 +180,9 @@ def archHelper(arch, os_name):
                     template_entrypoint = env.get_template(template_entrypoint_file)
 
                     entrypoint = template_entrypoint.render(
+                        image_type=image_type,
                         os=os_name,
+                        version=version,
                     )
 
                     with open(