diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 88de6e0da..a6ad75d84 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -49,12 +49,24 @@ resources:
     branch: {{branch}}
     private_key: {{rsa_id}}
     uri: git@github.com:spring-projects/atom-concourse.git
+- name: atom-concourse-out
+  type: git
+  source:
+    branch: {{branch}}
+    private_key: {{rsa_id}}
+    uri: git@github.com:spring-projects/atom-concourse.git
 - name: atom-bosh
   type: git
   source:
     branch: {{branch}}
     private_key: {{rsa_id}}
     uri: git@github.com:spring-projects/atom-bosh.git
+- name: atom-bosh-out
+  type: git
+  source:
+    branch: {{branch}}
+    private_key: {{rsa_id}}
+    uri: git@github.com:spring-projects/atom-bosh.git
 - name: tasks
   type: git
   source:
@@ -401,7 +413,7 @@ jobs:
       trigger: true
       passed:
       - promote-fatjars-to-rc
-  - task: build-manifest-yaml-atom-package
+  - task: build-atom-package
     input_mapping:
       package_sources: atom-cf-manifest-yaml
       fatjar: s3-manifest-yaml-fatjar-rc
@@ -410,6 +422,44 @@ jobs:
     params:
       repository: out/repo
       rebase: true
+- name: prepare-concourse-atom-rc
+  serial: true
+  plan:
+  - aggregate:
+    - get: sts4
+    - get: atom-concourse
+    - get: s3-concourse-fatjar-rc
+      trigger: true
+      passed:
+      - promote-fatjars-to-rc
+  - task: build-atom-package
+    input_mapping:
+      package_sources: atom-concourse
+      fatjar: s3-concourse-fatjar-rc
+    file: sts4/concourse/tasks/build-atom-package.yml
+  - put: atom-concourse-out
+    params:
+      repository: out/repo
+      rebase: true
+- name: prepare-bosh-atom-rc
+  serial: true
+  plan:
+  - aggregate:
+    - get: sts4
+    - get: atom-bosh
+    - get: s3-bosh-fatjar-rc
+      trigger: true
+      passed:
+      - promote-fatjars-to-rc
+  - task: build-atom-package
+    input_mapping:
+      package_sources: atom-bosh
+      fatjar: s3-bosh-fatjar-rc
+    file: sts4/concourse/tasks/build-atom-package.yml
+  - put: atom-bosh-out
+    params:
+      repository: out/repo
+      rebase: true
 - name: build-concourse-rc
   plan:
   - aggregate: