diff --git a/ci/pipelines/bosh-bootloader.yml b/ci/pipelines/bosh-bootloader.yml
index e8e81f3fa..3c72a8a2c 100644
--- a/ci/pipelines/bosh-bootloader.yml
+++ b/ci/pipelines/bosh-bootloader.yml
@@ -162,7 +162,7 @@ resources:
     uri: https://github.com/cloudfoundry/cf-deployment-concourse-tasks.git
 
 - name: cf-deployment-concourse-tasks-bbl-dev
-  type: docker-image
+  type: registry-image
   source:
     repository: cfinfrastructure/cf-deployment-concourse-tasks-bbl-dev
     tag: main
@@ -171,7 +171,7 @@ resources:
     email: cf-release-integration+dockerhub-push-bot@pivotal.io
 
 - name: cf-deployment-concourse-tasks-docker-image
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/cf-deployment-concourse-tasks
     tag: latest
diff --git a/ci/tasks/acceptance/task.yml b/ci/tasks/acceptance/task.yml
index e56ddf887..83b9737a8 100644
--- a/ci/tasks/acceptance/task.yml
+++ b/ci/tasks/acceptance/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/bbl-deployment
 
diff --git a/ci/tasks/bbl-up-concourse/task.yml b/ci/tasks/bbl-up-concourse/task.yml
index ea3f26111..2d6d15655 100644
--- a/ci/tasks/bbl-up-concourse/task.yml
+++ b/ci/tasks/bbl-up-concourse/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/cf-deployment-concourse-tasks
     tag: latest
diff --git a/ci/tasks/build-bbl-docs/task.yml b/ci/tasks/build-bbl-docs/task.yml
index 75467c759..3ebd461c5 100644
--- a/ci/tasks/build-bbl-docs/task.yml
+++ b/ci/tasks/build-bbl-docs/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cfinfrastructure/mkdocs
 
diff --git a/ci/tasks/build-release/task.yml b/ci/tasks/build-release/task.yml
index cf459f1b9..c796fdde1 100644
--- a/ci/tasks/build-release/task.yml
+++ b/ci/tasks/build-release/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/bbl-deployment
 
diff --git a/ci/tasks/bump-brew-tap/task.yml b/ci/tasks/bump-brew-tap/task.yml
index 40af1ef6e..b4b9ff31b 100644
--- a/ci/tasks/bump-brew-tap/task.yml
+++ b/ci/tasks/bump-brew-tap/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/bbl-deployment
 
diff --git a/ci/tasks/bump-deployments/task.yml b/ci/tasks/bump-deployments/task.yml
index 846786bce..a1646c0e3 100644
--- a/ci/tasks/bump-deployments/task.yml
+++ b/ci/tasks/bump-deployments/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: bosh/integration
     tag: main
diff --git a/ci/tasks/create-bosh-deployment-source-file/task.yml b/ci/tasks/create-bosh-deployment-source-file/task.yml
index a5d3c4f78..eddb1c7ad 100644
--- a/ci/tasks/create-bosh-deployment-source-file/task.yml
+++ b/ci/tasks/create-bosh-deployment-source-file/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/bbl-deployment
 
diff --git a/ci/tasks/download-terraform/task.yml b/ci/tasks/download-terraform/task.yml
index 7bb9ca8b2..152ee0ee3 100644
--- a/ci/tasks/download-terraform/task.yml
+++ b/ci/tasks/download-terraform/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: bosh/integration
     tag: main
diff --git a/ci/tasks/generate-version-from-sha/task.yml b/ci/tasks/generate-version-from-sha/task.yml
index 7a8b071af..a1f561343 100644
--- a/ci/tasks/generate-version-from-sha/task.yml
+++ b/ci/tasks/generate-version-from-sha/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/bbl-deployment
 
diff --git a/ci/tasks/get-concourse-test-vars/task.yml b/ci/tasks/get-concourse-test-vars/task.yml
index e1b0e5f33..10fe58890 100644
--- a/ci/tasks/get-concourse-test-vars/task.yml
+++ b/ci/tasks/get-concourse-test-vars/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/bbl-deployment
 
diff --git a/ci/tasks/leftovers/task.yml b/ci/tasks/leftovers/task.yml
index f2782fe0b..9cd387ac1 100644
--- a/ci/tasks/leftovers/task.yml
+++ b/ci/tasks/leftovers/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/cf-deployment-concourse-tasks
     tag: latest
diff --git a/ci/tasks/merge-bump-deployments-change/task.yml b/ci/tasks/merge-bump-deployments-change/task.yml
index b23ef1067..c9b1e7593 100644
--- a/ci/tasks/merge-bump-deployments-change/task.yml
+++ b/ci/tasks/merge-bump-deployments-change/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cfinfrastructure/minimal
 
diff --git a/ci/tasks/setup-github-release/task.yml b/ci/tasks/setup-github-release/task.yml
index ddc7f1059..8d26c943c 100644
--- a/ci/tasks/setup-github-release/task.yml
+++ b/ci/tasks/setup-github-release/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/bbl-deployment
 
diff --git a/ci/tasks/test-bosh-bootloader/task.yml b/ci/tasks/test-bosh-bootloader/task.yml
index b10a92735..ab4b0df61 100644
--- a/ci/tasks/test-bosh-bootloader/task.yml
+++ b/ci/tasks/test-bosh-bootloader/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/bbl-deployment
 
diff --git a/ci/tasks/test-bosh-ssh/task.yml b/ci/tasks/test-bosh-ssh/task.yml
index 58482be11..145a3e033 100644
--- a/ci/tasks/test-bosh-ssh/task.yml
+++ b/ci/tasks/test-bosh-ssh/task.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: cloudfoundry/cf-deployment-concourse-tasks
     tag: latest
diff --git a/storage/fixtures/upped/bosh-deployment/ci/bosh-alpha-compiled-releases/tasks/build-release.yml b/storage/fixtures/upped/bosh-deployment/ci/bosh-alpha-compiled-releases/tasks/build-release.yml
index fa137b89f..367fe5338 100755
--- a/storage/fixtures/upped/bosh-deployment/ci/bosh-alpha-compiled-releases/tasks/build-release.yml
+++ b/storage/fixtures/upped/bosh-deployment/ci/bosh-alpha-compiled-releases/tasks/build-release.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: bosh/main-bosh-docker
 
diff --git a/storage/fixtures/upped/bosh-deployment/ci/compiled-releases/tasks/export-release.yml b/storage/fixtures/upped/bosh-deployment/ci/compiled-releases/tasks/export-release.yml
index 083e40e4b..24c084869 100755
--- a/storage/fixtures/upped/bosh-deployment/ci/compiled-releases/tasks/export-release.yml
+++ b/storage/fixtures/upped/bosh-deployment/ci/compiled-releases/tasks/export-release.yml
@@ -2,7 +2,7 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: bosh/main-bosh-docker