diff --git a/ci/acceptance-test-utils/cats_cleanup.yml b/ci/acceptance-test-utils/cats_cleanup.yml
index 9ee63121..bb9954f0 100644
--- a/ci/acceptance-test-utils/cats_cleanup.yml
+++ b/ci/acceptance-test-utils/cats_cleanup.yml
@@ -2,9 +2,9 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
-    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
+    repository: cloudfoundry/cf-deployment-concourse-tasks
 
 inputs:
   - name: capi-ci
diff --git a/ci/bbl-tasks/extract_bbl_environment.yml b/ci/bbl-tasks/extract_bbl_environment.yml
index 9d157a69..3b64ed64 100644
--- a/ci/bbl-tasks/extract_bbl_environment.yml
+++ b/ci/bbl-tasks/extract_bbl_environment.yml
@@ -1,10 +1,10 @@
 platform: linux
 
+
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
-    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
-    tag: 'v5'
+    repository: cloudfoundry/cf-deployment-concourse-tasks
 
 inputs:
   - name: capi-ci
diff --git a/ci/bbl-tasks/run-bosh-cleanup.yml b/ci/bbl-tasks/run-bosh-cleanup.yml
index 192a177f..6bed5fb4 100644
--- a/ci/bbl-tasks/run-bosh-cleanup.yml
+++ b/ci/bbl-tasks/run-bosh-cleanup.yml
@@ -2,9 +2,9 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
-    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
+    repository: cloudfoundry/cf-deployment-concourse-tasks
 
 inputs:
 - name: capi-ci
diff --git a/ci/bbl-tasks/update-runtime-config.yml b/ci/bbl-tasks/update-runtime-config.yml
index 4e399679..249f25c4 100644
--- a/ci/bbl-tasks/update-runtime-config.yml
+++ b/ci/bbl-tasks/update-runtime-config.yml
@@ -2,10 +2,9 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
-    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
-    tag: 'v5'
+    repository: cloudfoundry/cf-deployment-concourse-tasks
 
 inputs:
 - name: capi-ci
diff --git a/ci/bosh/bosh-upload-stemcell.yml b/ci/bosh/bosh-upload-stemcell.yml
index 015fa66f..157afdaf 100644
--- a/ci/bosh/bosh-upload-stemcell.yml
+++ b/ci/bosh/bosh-upload-stemcell.yml
@@ -1,9 +1,9 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
-    repository: relintdockerhubpushbot/bosh-cli
+    repository: cloudfoundry/cf-deployment-concourse-tasksimage_resource
 
 inputs:
 - name: bbl-state
diff --git a/ci/bosh/create-elsa-vars-files.yml b/ci/bosh/create-elsa-vars-files.yml
index 1a4d6914..4f5bbbad 100644
--- a/ci/bosh/create-elsa-vars-files.yml
+++ b/ci/bosh/create-elsa-vars-files.yml
@@ -1,9 +1,10 @@
 ---
 platform: linux
+
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
-    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
+    repository: cloudfoundry/cf-deployment-concourse-tasks
 
 inputs:
 - name: elsa-aws-storage-terraform
diff --git a/ci/bosh/update_cloud_config.yml b/ci/bosh/update_cloud_config.yml
index 48c7c4d2..d9bc9e4e 100644
--- a/ci/bosh/update_cloud_config.yml
+++ b/ci/bosh/update_cloud_config.yml
@@ -2,9 +2,9 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
-    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
+    repository: cloudfoundry/cf-deployment-concourse-tasks
 
 inputs:
   - name: capi-ci
diff --git a/ci/bosh/upload-release.yml b/ci/bosh/upload-release.yml
index 422be562..4c5b14dc 100644
--- a/ci/bosh/upload-release.yml
+++ b/ci/bosh/upload-release.yml
@@ -1,9 +1,9 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
-    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
+    repository: cloudfoundry/cf-deployment-concourse-tasks
 
 inputs:
 - name: capi-ci
diff --git a/ci/bosh/upload-windows-stemcell-for-gcp.yml b/ci/bosh/upload-windows-stemcell-for-gcp.yml
index e954c0b1..cc63390e 100644
--- a/ci/bosh/upload-windows-stemcell-for-gcp.yml
+++ b/ci/bosh/upload-windows-stemcell-for-gcp.yml
@@ -1,9 +1,9 @@
 platform: linux
 
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
-    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
+    repository: cloudfoundry/cf-deployment-concourse-tasks
 
 inputs:
 - name: capi-ci