diff --git a/ci/images/README.adoc b/ci/images/README.adoc
index 07fb98b4..92fa3c2e 100644
--- a/ci/images/README.adoc
+++ b/ci/images/README.adoc
@@ -11,7 +11,7 @@ $ docker build --no-cache -f <image-folder>/Dockerfile .
 For example
 
 ----
-$ docker build --no-cache -f spring-graphql-ci-image/Dockerfile .
+$ docker build --no-cache -f ci-image/Dockerfile .
 ----
 
 To test run:
diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
index 4d04ecca..68403e92 100644
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20201008
+FROM ubuntu:focal-20210609
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh
index eec7c536..4c92ff9a 100755
--- a/ci/images/get-jdk-url.sh
+++ b/ci/images/get-jdk-url.sh
@@ -3,13 +3,13 @@ set -e
 
 case "$1" in
 	java8)
-		 echo "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz"
+		 echo "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz"
 	;;
 	java11)
-		 echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz"
+		 echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz"
 	;;
-	java15)
-		 echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz"
+	java16)
+		 echo "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz"
 	;;
   *)
 		echo $"Unknown java version"
diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index 63b80dec..a2b30b9a 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -13,9 +13,9 @@ dpkg-reconfigure --frontend noninteractive tzdata
 
 rm -rf /var/lib/apt/lists/*
 
-curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.3/concourse-java.sh > /opt/concourse-java.sh
+curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh > /opt/concourse-java.sh
 
-curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.2.1/concourse-release-scripts-0.2.1.jar
+curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.3/concourse-release-scripts-0.3.3.jar
 
 ###########################################################
 # JAVA
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 0673aebe..d4db625a 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -13,7 +13,7 @@ resource_types:
   type: registry-image
   source:
     repository: springio/artifactory-resource
-    tag: 0.0.12
+    tag: 0.0.14
 
 resources:
 - name: git-repo