diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json
index 7675be97a..f480d59da 100644
--- a/atom-extensions/atom-commons/package.json
+++ b/atom-extensions/atom-commons/package.json
@@ -9,7 +9,7 @@
   },
   "main": "./dist/index",
   "dependencies": {
-    "atom-languageclient": "git://github.com/BoykoAlex/atom-languageclient#grammar-override",
+    "atom-languageclient": "git://github.com/atom/atom-languageclient#master",
     "decompress": "^4.2.0",
     "portfinder": "^1.0.13",
     "remote-file-size": "^3.0.3",
diff --git a/atom-extensions/atom-commons/src/jar-language-client.js b/atom-extensions/atom-commons/src/jar-language-client.js
index e39c4ee2e..ebc46be07 100644
--- a/atom-extensions/atom-commons/src/jar-language-client.js
+++ b/atom-extensions/atom-commons/src/jar-language-client.js
@@ -125,12 +125,6 @@ export class JarLanguageClient extends AutoLanguageClient {
         })
     }
 
-    // createRpcConnection(process) {
-    //     let connection = super.createRpcConnection(process);
-    //     connection.trace(rpc.Trace.Messages, console);
-    //     return connection;
-    // }
-
     findJavaExecutable(binname) {
         binname = this.correctBinname(binname);
 
diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index ae86c1cfd..4432f41cb 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -101,6 +101,14 @@ resources:
     secret_access_key: {{s3_secretkey}}
     region_name: {{s3_region}}
     regexp: sts4/fatjars/snapshots/concourse-language-server-(.*).jar
+- name: s3-atom-cf-manifest-yaml-snapshot
+  type: s3
+  source:
+    bucket: {{s3_bucket}}
+    access_key_id: {{s3_accesskey}}
+    secret_access_key: {{s3_secretkey}}
+    region_name: {{s3_region}}
+    regexp: sts4/atom/snapshots/(.*)cf-manifest-yaml-(.*).tgz
 - name: snapshot-website
   type: s3-multi
   source:
@@ -464,9 +472,11 @@ jobs:
       - put: s3-manifest-yaml-fatjar-snapshot
         params:
           file: out/manifest-yaml-language-server-*.jar
+          acl: public-read
       - put: s3-concourse-fatjar-snapshot
         params:
           file: out/concourse-language-server-*.jar
+          acl: public-read
 - name: build-manifest-yaml-atom-package
   plan:
   - aggregate:
@@ -484,17 +494,14 @@ jobs:
       package_sources: atom-cf-manifest-yaml
       fatjar: s3-manifest-yaml-fatjar-snapshot
     file: sts4/concourse/tasks/build-atom-package.yml
-      
-#boot-java-language-server-0.0.2-201708031854.jar
-# -rw-r--r-- 1 root root 16846312 Aug  3 18:54 boot-properties-language-server-0.0.2-201708031854.jar
-# -rw-r--r-- 1 root root  7936924 Aug  3 18:54 bosh-language-server-0.0.8-201708031854.jar
-# -rw-r--r-- 1 root root  7979261 Aug  3 18:54 concourse-language-server-0.0.8-201708031854.jar
-# -rw-r--r-- 1 root root 20783856 Aug  3 18:54 manifest-yaml-language-server-0.0.9-201708031854.jar
-
-
-
   on_failure:
     put: slack-notification
     params:
       text: |
          Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!
+  on_success:
+    aggregate:
+    - put: s3-atom-cf-manifest-yaml-snapshot
+      params:
+        file: out/*cf-manifest-yaml-*.tgz
+        acl: public-read
diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh
index abdf3399f..becb0443a 100755
--- a/concourse/tasks/build-atom-package.sh
+++ b/concourse/tasks/build-atom-package.sh
@@ -2,9 +2,32 @@
 set -e
 set -v
 workdir=`pwd`
+output=$workdir/out
 
 url=`cat fatjar/url`
 
-echo "The url of the fatjar is ${url}"
+cd package_sources
 
-ls -la
\ No newline at end of file
+npm install ../sts4/atom-extensions/atom-commons
+
+cat > properties.json << EOF
+{
+    jarUrl: ${url}
+}
+EOF
+
+npm install
+
+npm install bundle-deps
+
+node ./node_modules/bundle-deps/bundle-deps .
+
+basename=$(npm pack | tee /dev/tty)
+
+timestamp=`date -u +%Y%m%d%H%M`
+
+length=${#basename}
+
+newName=${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}}
+
+cp ${basename} $output/${newName}
\ No newline at end of file