diff --git a/ci/images/README.adoc b/ci/images/README.adoc
index 84eae1609e..a2f45c5626 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-boot-ci-image/Dockerfile .
+$ docker build --no-cache -f ci-image/Dockerfile .
 ----
 
 To test run:
diff --git a/ci/parameters.yml b/ci/parameters.yml
index 2405bc80f2..de7fcdb94b 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -8,7 +8,6 @@ artifactory-server: "https://repo.spring.io"
 branch: "master"
 milestone: "2.4.x"
 build-name: "spring-boot"
-ci-image-name: "spring-boot-ci-24x"
 concourse-url: "https://ci.spring.io"
 bintray-subject: "spring"
 bintray-repo: "jars"
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index e1e1358e91..8b7ac7b2fe 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -4,7 +4,7 @@ anchors:
     username: ((github-username))
     password: ((github-password))
     branch: ((branch))
-  docker-resource-source: &docker-resource-source
+  registry-image-resource-source: &registry-image-resource-source
     username: ((docker-hub-username))
     password: ((docker-hub-password))
     tag: ((milestone))
@@ -144,20 +144,20 @@ resources:
   type: registry-image
   icon: docker
   source:
-    <<: *docker-resource-source
-    repository: ((docker-hub-organization))/((ci-image-name))
+    <<: *registry-image-resource-source
+    repository: ((docker-hub-organization))/spring-boot-ci
 - name: ci-image-jdk11
   type: registry-image
   icon: docker
   source:
-    <<: *docker-resource-source
-    repository: ((docker-hub-organization))/((ci-image-name))-jdk11
+    <<: *registry-image-resource-source
+    repository: ((docker-hub-organization))/spring-boot-ci-jdk11
 - name: ci-image-jdk15
   type: registry-image
   icon: docker
   source:
-    <<: *docker-resource-source
-    repository: ((docker-hub-organization))/((ci-image-name))-jdk15
+    <<: *registry-image-resource-source
+    repository: ((docker-hub-organization))/spring-boot-ci-jdk15
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant
@@ -211,19 +211,39 @@ jobs:
   plan:
   - get: ci-images-git-repo
     trigger: true
+  - get: git-repo
+  - in_parallel:
+    - task: build-ci-image
+      privileged: true
+      file: git-repo/ci/tasks/build-ci-image.yml
+      output_mapping:
+        image: ci-image
+      vars:
+        ci-image-name: ci-image
+    - task: build-ci-image-jdk11
+      privileged: true
+      file: git-repo/ci/tasks/build-ci-image.yml
+      output_mapping:
+        image: ci-image-jdk11
+      vars:
+        ci-image-name: ci-image-jdk11
+    - task: build-ci-image-jdk15
+      privileged: true
+      file: git-repo/ci/tasks/build-ci-image.yml
+      output_mapping:
+        image: ci-image-jdk15
+      vars:
+        ci-image-name: ci-image-jdk15
   - in_parallel:
     - put: ci-image
       params:
-        build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/ci-image/Dockerfile
+        image: ci-image/image.tar
     - put: ci-image-jdk11
       params:
-        build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/ci-image-jdk11/Dockerfile
+        image: ci-image-jdk11/image.tar
     - put: ci-image-jdk15
       params:
-        build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/ci-image-jdk15/Dockerfile
+        image: ci-image-jdk15/image.tar
 - name: detect-jdk-updates
   plan:
   - get: git-repo
diff --git a/ci/tasks/build-ci-image.yml b/ci/tasks/build-ci-image.yml
new file mode 100644
index 0000000000..b1bcff6eb4
--- /dev/null
+++ b/ci/tasks/build-ci-image.yml
@@ -0,0 +1,18 @@
+---
+platform: linux
+image_resource:
+  type: registry-image
+  source:
+    repository: vito/oci-build-task
+inputs:
+- name: ci-images-git-repo
+outputs:
+- name: image
+caches:
+- path: ci-image-cache
+params:
+  CONTEXT: ci-images-git-repo/ci/images
+  DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile
+  REGISTRY_MIRRORS: ((dockerhub-registry-mirror))
+run:
+  path: build
diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml
index 394cb11bf5..136106e70b 100755
--- a/ci/tasks/generate-changelog.yml
+++ b/ci/tasks/generate-changelog.yml
@@ -1,7 +1,7 @@
 ---
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: springio/github-changelog-generator
     tag: '0.0.5'