diff --git a/images/base/helper-scripts/detect-setup.sh b/images/base/helper-scripts/detect-setup.sh
index 3d4e7fc..d78da00 100644
--- a/images/base/helper-scripts/detect-setup.sh
+++ b/images/base/helper-scripts/detect-setup.sh
@@ -4,19 +4,39 @@ CA_FILE="/etc/ssl/certs/ca-certificates.crt"
 
 # yarn
 if command -v yarn -v &> /dev/null; then
+    echo ""
     echo "add $CA_FILE to yarn"
     yarn config set cafile $CA_FILE
 fi
 
 # java
 if command -v java --version &> /dev/null; then
-    echo "add $CA_FILE to yarn"
-    keytool -importcert -alias $CA_FILE -keystore /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/jre/lib/security/cacerts -storepass changeit -file $CA_FILE -noprompt
+    echo ""
+    javacerts=/tmp/javacerts
+    echo "add $CA_FILE to java keystore"
+    echo "generating single certs at $javacerts/"
+    mkdir -p $javacerts
+    cat $CA_FILE | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > ("/tmp/javacerts/cert" n ".crt")}'
+
+    for f in $javacerts/*.crt ; do
+        # delete empty lines in files
+        sed -i '/^$/d' $f
+    done
+    # delete empty files to prevent errors at import
+    find $javacerts -empty -delete
+
+    for x in $javacerts/*.crt ; do
+        alias=$(openssl x509 -noout -subject -in "$x" | awk -F= '{print $NF}' | sed -e 's/^[ \t]*//' | sed -e 's/ /_/g')
+        echo "importing cert of $alias"
+        keytool -importcert -alias $alias -keystore /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/jre/lib/security/cacerts -storepass changeit -file $x -noprompt
+    done
+    rm -rf $javacerts
 fi
 
 # maven
 if command -v mvn -v &> /dev/null; then
     if [ -f /mnt/dynamic/settings.xml ]; then
+        echo ""
         echo "linking settings.xml from /mnt/dynamic/settings.xml to ${HOME}/.m2/settings.xml"
         ln -s /mnt/dynamic/settings.xml ${HOME}/.m2/settings.xml
     fi