diff --git a/ci/scripts/generate-docker-credentials.sh b/ci/scripts/generate-docker-credentials.sh
new file mode 100755
index 00000000..04166ed4
--- /dev/null
+++ b/ci/scripts/generate-docker-credentials.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -eu
+
+export TERM="xterm-256color"
+
+readonly DOCKER_CONFIG_OUTPUT="${DOCKER_CONFIG_OUTPUT:?must be set}"
+
+# Note that we don't use libs.sh here because that script requires bash, and
+# we don't have bash in this container image
+
+printf "%s" "$REGISTRY_PASSWORD" | docker login "$REGISTRY" --username "$REGISTRY_USERNAME" --password-stdin
+cp -v ~/.docker/config.json "$DOCKER_CONFIG_OUTPUT/"
diff --git a/ci/tasks/build-image.yml b/ci/tasks/build-image.yml
deleted file mode 100644
index 1de31aa0..00000000
--- a/ci/tasks/build-image.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-platform: linux
-image_resource:
-  type: registry-image
-  source:
-    repository: ((dockerhub-mirror-registry))/concourse/oci-build-task
-    tag: 0.11.1
-
-inputs:
-  - name: source
-
-outputs:
-  - name: image
-
-run:
-  path: build
-
-params:
-  CONTEXT:
diff --git a/ci/tasks/build-oci-image.yml b/ci/tasks/build-oci-image.yml
new file mode 100644
index 00000000..8d4f07f8
--- /dev/null
+++ b/ci/tasks/build-oci-image.yml
@@ -0,0 +1,25 @@
+---
+platform: linux
+
+image_resource:
+  type: registry-image
+  source:
+    repository: ((open-service-broker-virtual-docker-registry))/concourse/oci-build-task
+    tag: 0.11.1
+    username: ((broadcom-jfrog-artifactory-robot-account.username))
+    password: ((broadcom-jfrog-artifactory-robot-account.password))
+
+inputs:
+  - name: git-repo
+  - name: docker-config
+
+outputs:
+  - name: image
+
+run:
+  path: build
+
+params:
+  CONTEXT:
+  DEBUG: true
+  DOCKER_CONFIG: docker-config
diff --git a/ci/tasks/build-project.yml b/ci/tasks/build-project.yml
index af07de32..d5f4cbc8 100644
--- a/ci/tasks/build-project.yml
+++ b/ci/tasks/build-project.yml
@@ -3,9 +3,9 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: ((corporate-harbor-registry))/((dockerhub-organization))/scosb-ci
-    username: ((corporate-harbor-robot-account.username))
-    password: ((corporate-harbor-robot-account.password))
+    repository: ((open-service-broker-dev-docker-registry))/ci/scosb-ci
+    username: ((broadcom-jfrog-artifactory-robot-account.username))
+    password: ((broadcom-jfrog-artifactory-robot-account.password))
     tag: ((ci-image-tag))
 inputs:
   - name: git-repo
diff --git a/ci/tasks/generate-docker-credentials.yml b/ci/tasks/generate-docker-credentials.yml
new file mode 100644
index 00000000..38f68633
--- /dev/null
+++ b/ci/tasks/generate-docker-credentials.yml
@@ -0,0 +1,25 @@
+platform: linux
+
+image_resource:
+  type: registry-image
+  source:
+    repository: ((open-service-broker-virtual-docker-registry))/docker
+    tag: 26-cli
+    username: ((broadcom-jfrog-artifactory-robot-account.username))
+    password: ((broadcom-jfrog-artifactory-robot-account.password))
+
+inputs:
+  - name: git-repo
+
+outputs:
+  - name: docker-config
+
+run:
+  path: ci/scripts/generate-docker-credentials.sh
+  dir: git-repo
+
+params:
+  DOCKER_CONFIG_OUTPUT: ../docker-config
+  REGISTRY: ((registry))
+  REGISTRY_USERNAME: ((registry-username))
+  REGISTRY_PASSWORD: ((registry-password))
diff --git a/ci/tasks/promote.yml b/ci/tasks/promote.yml
index ef4a0164..25dcaf56 100644
--- a/ci/tasks/promote.yml
+++ b/ci/tasks/promote.yml
@@ -3,7 +3,9 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: ((dockerhub-mirror-registry))/springio/concourse-release-scripts
+    repository: ((open-service-broker-virtual-docker-registry))/springio/concourse-release-scripts
+    username: ((broadcom-jfrog-artifactory-robot-account.username))
+    password: ((broadcom-jfrog-artifactory-robot-account.password))
     tag: '0.3.4'
 inputs:
   - name: git-repo
diff --git a/ci/tasks/stage.yml b/ci/tasks/stage.yml
index f6f49cde..afb95c6c 100644
--- a/ci/tasks/stage.yml
+++ b/ci/tasks/stage.yml
@@ -3,9 +3,9 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: ((corporate-harbor-registry))/((dockerhub-organization))/scosb-ci
-    username: ((corporate-harbor-robot-account.username))
-    password: ((corporate-harbor-robot-account.password))
+    repository: ((open-service-broker-dev-docker-registry))/ci/scosb-ci
+    username: ((broadcom-jfrog-artifactory-robot-account.username))
+    password: ((broadcom-jfrog-artifactory-robot-account.password))
     tag: ((ci-image-tag))
 inputs:
   - name: git-repo
diff --git a/ci/tasks/sync-to-maven-central.yml b/ci/tasks/sync-to-maven-central.yml
index 0b5d0090..cde74a50 100644
--- a/ci/tasks/sync-to-maven-central.yml
+++ b/ci/tasks/sync-to-maven-central.yml
@@ -3,7 +3,9 @@ platform: linux
 image_resource:
   type: registry-image
   source:
-    repository: ((dockerhub-mirror-registry))/springio/concourse-release-scripts
+    repository: ((open-service-broker-virtual-docker-registry))/springio/concourse-release-scripts
+    username: ((broadcom-jfrog-artifactory-robot-account.username))
+    password: ((broadcom-jfrog-artifactory-robot-account.password))
     tag: '0.3.4'
 inputs:
   - name: git-repo