diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5673d45..e767682 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,18 +35,9 @@ cache:
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
 
-# Note: image "maven:3-eclipse-temurin-8-alpine" does not work!
-java-8:
-  extends: .java
-  image: $CI_REGISTRY_IMAGE/maven:3-jdk-8
-
-java-8-openj9:
-  extends: .java_extended
-  image: $CI_REGISTRY_IMAGE/maven:3-jdk-8-openj9
-
 java-11:
   extends: .java
-  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine
+  image: $CI_REGISTRY_IMAGE/maven:3-jdk-11
   needs: [ ]
   script:
     - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP install
@@ -61,13 +52,37 @@ java-11:
         - target/surefire-reports/*.xml
         - target/failsafe-reports/*.xml
 
+java8:
+  extends: .java
+  image: $CI_REGISTRY_IMAGE/maven:3-jdk-8
+
 java-11-openj9:
   extends: .java_extended
   image: $CI_REGISTRY_IMAGE/maven:3-jdk-11-openj9
 
+java-8-openj9:
+  extends: .java_extended
+  image: $CI_REGISTRY_IMAGE/maven:3-jdk-8-openj9
+
+java-15:
+  extends: .java_extended
+  image: $CI_REGISTRY_IMAGE/maven:3-openjdk-15
+
+java-16:
+  extends: .java_extended
+  image: $CI_REGISTRY_IMAGE/maven:3-openjdk-16
+
 java-17:
   extends: .java
-  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-17-alpine
+  image: $CI_REGISTRY_IMAGE/maven:3-openjdk-17
+
+java-18:
+  extends: .java_extended
+  image: $CI_REGISTRY_IMAGE/maven:3-openjdk-18
+
+java-19:
+  extends: .java_extended
+  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-19-alpine
 
 java-21:
   extends: .java
@@ -79,7 +94,7 @@ java-24:
 
 deploy:
   stage: deploy
-  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine
+  image: $CI_REGISTRY_IMAGE/maven:3-jdk-11
   needs:
     - job: java-11
   script:
@@ -109,7 +124,7 @@ create-build-image:
 
 owasp-check:
   extends: .java
-  image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-11-alpine
+  image: $CI_REGISTRY_IMAGE/maven:3-jdk-11
   needs: [ ]
   script:
     - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP validate -Powasp-check
@@ -119,3 +134,5 @@ owasp-check:
       changes:
         - pom.xml
         - owasp-suppressions.xml
+
+
diff --git a/.mvn/createBuildImages.sh b/.mvn/createBuildImages.sh
index e29998b..1cd5ec7 100644
--- a/.mvn/createBuildImages.sh
+++ b/.mvn/createBuildImages.sh
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-TAGS=("3-jdk-8" "3-jdk-8-openj9" "3-eclipse-temurin-11-alpine" "3-jdk-11-openj9" "3-eclipse-temurin-17-alpine" "3-eclipse-temurin-21-alpine" "3-eclipse-temurin-24-alpine")
+TAGS=("3-openjdk-16" "3-jdk-11" "3-jdk-11-openj9" "3-jdk-8" "3-jdk-8-openj9" "3-openjdk-15" "3-openjdk-17" "3-openjdk-18" "3-eclipse-temurin-19-alpine")
 
 docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
 for i in "${TAGS[@]}"
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 4b3eff9..16bf637 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -59,8 +59,8 @@ cleanup_profile=_initCleanUpProfile
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_init
-formatter_settings_version=23
+formatter_profile=_initFormatterProfile
+formatter_settings_version=12
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;lombok;de;
 org.eclipse.jdt.ui.javadoc=true
diff --git a/src/test/resources/examples/resolving/withRemote.xsd b/src/test/resources/examples/resolving/withRemote.xsd
index 1d458d8..1811f74 100644
--- a/src/test/resources/examples/resolving/withRemote.xsd
+++ b/src/test/resources/examples/resolving/withRemote.xsd
@@ -18,8 +18,9 @@
 <schema xmlns:context="http://www.springframework.org/schema/context" xmlns="http://www.w3.org/2001/XMLSchema"
         targetNamespace="http://www.example.org/main"
         elementFormDefault="qualified">
+
     <import namespace="http://www.springframework.org/schema/context"
-            schemaLocation="https://www.springframework.org/schema/context/spring-context.xsd" />
+            schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd" />
 
     <complexType name="MainType">
         <sequence>