diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 9046b9ccb..7d596cf94 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -25,12 +25,24 @@ resources:
     uri: git@github.com:spring-projects/sts4.git
     branch: {{branch}}
     private_key: {{rsa_id}}
+- name: sts4-out
+  type: git
+  source:
+    uri: git@github.com:spring-projects/sts4.git
+    branch: {{branch}}
+    private_key: {{rsa_id}}
 - name: atom-cf-manifest-yaml
   type: git
   source:
     branch: {{branch}}
     private_key: {{rsa_id}}
     uri: git@github.com:spring-projects/atom-cf-manifest-yaml.git
+- name: atom-cf-manifest-yaml-out
+  type: git
+  source:
+    branch: {{branch}}
+    private_key: {{rsa_id}}
+    uri: git@github.com:spring-projects/atom-cf-manifest-yaml.git
 - name: atom-concourse
   type: git
   source:
@@ -51,12 +63,6 @@ resources:
     paths:
     - concourse/tasks
     private_key: {{rsa_id}}
-- name: sts4-out
-  type: git
-  source:
-    uri: git@github.com:spring-projects/sts4.git
-    branch: {{branch}}
-    private_key: {{rsa_id}}
 - name: s3-boot-properties-vsix-snapshot
   type: s3
   source:
@@ -385,6 +391,24 @@ jobs:
       params:
         file: s3-manifest-yaml-fatjar-snapshot/*.jar
         acl: public-read
+- name: prepare-manifest-yaml-atom-rc
+  serial: true
+  plan:
+  - aggregate:
+    - get: atom-cf-manifest-yaml
+    - get: s3-manifest-yaml-fatjar-rc
+      trigger: true
+      passed:
+      - promote-fatjars-to-rc
+  - task: build-manifest-yaml-atom-package
+    input_mapping:
+      package_sources: atom-cf-manifest-yaml
+      fatjar: s3-manifest-yaml-fatjar-snapshot
+    file: sts4/concourse/tasks/build-atom-package.yml
+  - put: atom-cf-manifest-yaml-out
+    params:
+      repository: out/repo
+      rebase: true
 - name: build-concourse-rc
   plan:
   - aggregate:
diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh
index c651c1c2c..b61d0b5c6 100755
--- a/concourse/tasks/build-atom-package.sh
+++ b/concourse/tasks/build-atom-package.sh
@@ -7,6 +7,7 @@ atom_commons=$workdir/sts4/atom-extensions/atom-commons
 atom_package=$workdir/package_sources
 
 url=`cat fatjar/url`
+fatjar_version=`cat fatjar/version`
 
 cd $atom_commons
 npm install
@@ -36,3 +37,13 @@ length=${#basename}
 newName=${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}}
 
 cp ${basename} $output/${newName}
+
+git config user.email "kdevolder@pivotal.io"
+git config user.name "Kris De Volder"
+
+git add .
+
+git commit \
+    -m "Use fatjar version to ${fatjarversion}"
+
+git clone $atom_package $workdir/out/repo