diff --git a/ci/pipelines/builder.yml b/ci/pipelines/builder.yml
index 9f31b4eb00..b77960d333 100644
--- a/ci/pipelines/builder.yml
+++ b/ci/pipelines/builder.yml
@@ -81,17 +81,31 @@ jobs:
     - task: build-docker-args
       file: bosh-stemcells-ci/ci/tasks/build-docker-args.yml
       image: ubuntu_base
-    - put: os-image-stemcell-builder-docker-image
+    - task: build-image
+      privileged: true
+      config:
+        platform: linux
+        image_resource:
+          type: registry-image
+          source:
+            repository: concourse/oci-build-task
+        inputs:
+        - name: os-image-stemcell-builder-dockerfile
+        - name: docker-build-args
+        outputs:
+        - name: image
+        params:
+          CONTEXT: os-image-stemcell-builder-dockerfile/ci/docker/os-image-stemcell-builder
+          BUILD_ARGS_FILE: docker-build-args/docker-build-args.yml
+          BUILD_ARG_BASE_IMAGE: ubuntu:(@= data.values.stemcell_details.os_short_name @)
+          BUILD_ARG_OVF_TOOL_INSTALLER: "VMware-ovftool-4.4.3-18663434-lin.x86_64.bundle"
+          BUILD_ARG_OVF_TOOL_INSTALLER_SHA1: "6c24e473be49c961cfc3bb16774b52b48e822991"
+        run:
+          path: build
+    - put: os-image-stemcell-builder-registry-image
       no_get: true
       params:
-        build: os-image-stemcell-builder-dockerfile/ci/docker/os-image-stemcell-builder
-        build_args_file: docker-build-args/docker-build-args.json
-        build_args:
-          BASE_IMAGE: ubuntu:(@= data.values.stemcell_details.os_short_name @)
-          OVF_TOOL_INSTALLER: "VMware-ovftool-4.4.3-18663434-lin.x86_64.bundle"
-          OVF_TOOL_INSTALLER_SHA1: "6c24e473be49c961cfc3bb16774b52b48e822991"
-      get_params:
-        skip_download: true
+        image: image/image.tar
 
 #! Manually triggered job that idempotently ensures the GCP subnetwork and
 #! firewall rule consumed by deploy-director / cleanup-bats-vms / prepare-bats
@@ -1177,14 +1191,6 @@ resources:
     username: ((dockerhub_username))
     password: ((dockerhub_password))
 
-- name: os-image-stemcell-builder-docker-image
-  type: docker-image
-  source:
-    repository: bosh/os-image-stemcell-builder
-    tag: (@= data.values.stemcell_details.os_short_name @)
-    username: ((dockerhub_username))
-    password: ((dockerhub_password))
-
 - name: bosh-os-image-builder-vmware-ovftool
   type: gcs-resource
   source:
diff --git a/ci/tasks/build-docker-args.sh b/ci/tasks/build-docker-args.sh
index beeb9ea540..d56f2c02c0 100755
--- a/ci/tasks/build-docker-args.sh
+++ b/ci/tasks/build-docker-args.sh
@@ -31,18 +31,13 @@ ruby_install_url="$(curl -s https://api.github.com/repos/postmodern/ruby-install
 ruby_version="$(cat "${REPO_ROOT}/.ruby-version")"
 gem_home="/usr/local/bundle"
 
-cat << EOF > "${REPO_PARENT}/docker-build-args/docker-build-args.json"
-{
-  "META4_CLI_URL": "${meta4_cli_url}",
-  "SYFT_CLI_URL": "${syft_cli_url}",
-  "YQ_CLI_URL": "${yq_cli_url}",
-
-  "RUBY_INSTALL_URL": "${ruby_install_url}",
-  "RUBY_VERSION": "${ruby_version}",
-  "GEM_HOME": "${gem_home}",
-
-  "placeholder": "without trailing comma"
-}
+cat << EOF > "${REPO_PARENT}/docker-build-args/docker-build-args.yml"
+META4_CLI_URL: "${meta4_cli_url}"
+SYFT_CLI_URL: "${syft_cli_url}"
+YQ_CLI_URL: "${yq_cli_url}"
+RUBY_INSTALL_URL: "${ruby_install_url}"
+RUBY_VERSION: "${ruby_version}"
+GEM_HOME: "${gem_home}"
 EOF
 
-cat "${REPO_PARENT}/docker-build-args/docker-build-args.json"
+cat "${REPO_PARENT}/docker-build-args/docker-build-args.yml"