diff --git a/Jenkinsfile b/Jenkinsfile
index 134c0a4..7a4007e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,8 +19,11 @@
 // without this, the agent could be using a pod created from a different descriptor
 env.label = "glassfish-ci-pod-${UUID.randomUUID().toString()}"
 
-// Docker image defined in this project in [glassfish]/etc/docker/Dockerfile
-env.gfImage = "dmatej/eclipse-jenkins-glassfish:11.0.14.1"
+// Docker images defined in this project in [glassfish]/etc/docker*
+// Older image
+env.gfImage11 = "dmatej/eclipse-jenkins-glassfish:11.0.14.1"
+// Image required to be able to build hibernate-validator snapshot, but now used for glassfish too
+env.gfImage17 = "dmatej/eclipse-jenkins-glassfish:17.20"
 
 def jobs = [
   "verifyPhase",
@@ -64,7 +67,7 @@
       containers: [
         containerTemplate(
           name: "glassfish-build",
-          image: "${env.gfImage}",
+          image: "${env.gfImage17}",
           resourceRequestMemory: "7Gi",
           resourceRequestCpu: "2650m"
         )
@@ -97,7 +100,7 @@
       containers: [
         containerTemplate(
           name: "glassfish-build",
-          image: "${env.gfImage}",
+          image: "${env.gfImage17}",
           resourceRequestMemory: "4Gi",
           resourceRequestCpu: "2650m"
         )
@@ -156,7 +159,7 @@
         memory: "1200Mi"
         cpu: "300m"
   - name: glassfish-build
-    image: ${env.gfImage}
+    image: ${env.gfImage17}
     args:
     - cat
     tty: true
diff --git a/etc/docker-jdk17/Dockerfile b/etc/docker-jdk17/Dockerfile
new file mode 100644
index 0000000..e8c7e24
--- /dev/null
+++ b/etc/docker-jdk17/Dockerfile
@@ -0,0 +1,70 @@
+FROM krallin/centos-tini
+
+ADD ./entrypoint.sh /etc/
+
+# HOWTO:
+#
+# 1) cd etc/docker
+# 2) wget https://github.com/AdoptOpenJDK/openjdk17-binaries/releases/download/jdk-2021-05-07-13-31/OpenJDK-jdk_x64_linux_hotspot_2021-05-06-23-30.tar.gz
+# 3) tar -xvzf OpenJDK-jdk_x64_linux_hotspot_2021-05-06-23-30.tar.gz
+# 4) make # takes aroung 5 minutes, depending on network speed
+# 5) docker login
+# 6) docker push dmatej/eclipse-jenkins-glassfish:17.20 or another repository, don't forget to update the Jenkinsfile and Makefile too.
+# 7) docker logout
+# 8) git commit, git push, run jenkins build, etc.
+#
+ADD ./jdk-17+20 /usr/lib/jvm/jdk17
+
+RUN chmod +x /etc/entrypoint.sh && \
+    #
+    # install utilities
+    #
+    yum install -y which unzip tar wget zip sendmail && \
+    update-ca-trust && \
+    #
+    # setup jdk
+    #
+    cp -Lf /etc/pki/java/cacerts /usr/lib/jvm/jdk17/lib/security/cacerts && \
+    ln -s /usr/lib/jvm/jdk17/bin/* /bin/ && \
+    #
+    # install maven
+    #
+    curl -O https://archive.apache.org/dist/maven/maven-3/3.8.5/binaries/apache-maven-3.8.5-bin.zip && \
+    unzip apache-maven-*-bin.zip -d /usr/share && \
+    rm apache-maven-*-bin.zip && \
+    mv /usr/share/apache-maven-* /usr/share/maven && \
+    ln -s /usr/share/maven/bin/mvn /bin/ && \
+    #
+    # install takari extensions
+    #
+    curl -O https://repo1.maven.org/maven2/io/takari/aether/takari-local-repository/0.11.2/takari-local-repository-0.11.2.jar && \
+    mv takari-local-repository-*.jar /usr/share/maven/lib/ext/ && \
+    curl -O https://repo1.maven.org/maven2/io/takari/takari-filemanager/0.8.3/takari-filemanager-0.8.3.jar && \
+    mv takari-filemanager-*.jar /usr/share/maven/lib/ext/ && \
+    #
+    # install ant
+    #
+    curl -O https://archive.apache.org/dist/ant/binaries/binaries/apache-ant-1.9.4-bin.zip && \
+    unzip apache-ant-*-bin.zip -d /usr/share && \
+    rm apache-ant-*-bin.zip && \
+    mv /usr/share/apache-ant-* /usr/share/ant && \
+    ln -s /usr/share/ant/bin/ant /bin/ && \
+    #
+    # custom user
+    #
+    useradd -l -r -d /home/jenkins -u 1000100000 -g root -s /bin/bash jenkins && \
+    mkdir -p /home/jenkins/.m2/repository/org/glassfish/main && \
+    chmod 777 -R /home/jenkins/.m2/repository/org/glassfish/main && \
+    chown -R jenkins:root /home/jenkins
+
+ENV JAVA_HOME /usr/lib/jvm/jdk17
+ENV MAVEN_HOME /usr/share/maven
+ENV M2_HOME /usr/share/maven
+ENV ANT_HOME /usr/share/ant
+ENV JAVA_TOOL_OPTIONS "-Xmx2G -Xss768k"
+
+ENV HOME /home/jenkins
+WORKDIR /home/jenkins
+USER jenkins
+
+ENTRYPOINT ["/usr/local/bin/tini", "--", "/etc/entrypoint.sh" ]
diff --git a/etc/docker-jdk17/Makefile b/etc/docker-jdk17/Makefile
new file mode 100644
index 0000000..67a50e7
--- /dev/null
+++ b/etc/docker-jdk17/Makefile
@@ -0,0 +1,17 @@
+SHELL := /bin/bash
+IMAGE_TAG = 17.20
+
+.PHONY: clean docker-clean docker-build docker-push
+
+default: docker-build
+
+clean: docker-clean
+
+docker-clean:
+	docker rmi dmatej/eclipse-jenkins-glassfish:$(IMAGE_TAG)
+
+docker-build:
+	docker build -t dmatej/eclipse-jenkins-glassfish:$(IMAGE_TAG) .
+
+docker-push:
+	docker push dmatej/eclipse-jenkins-glassfish:$(IMAGE_TAG)
diff --git a/etc/docker-jdk17/entrypoint.sh b/etc/docker-jdk17/entrypoint.sh
new file mode 100755
index 0000000..632fedf
--- /dev/null
+++ b/etc/docker-jdk17/entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "starting sendmail..."
+/usr/sbin/sendmail -bd -q1h
+
+exec "$@"
\ No newline at end of file