diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 4f0742966..5b6347c8d 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -79,6 +79,14 @@ resources:
     secret_access_key: {{s3_secretkey}}
     region_name: {{s3_region}}
     regexp: sts4/vscode-extensions/snapshots/vscode-manifest-yaml-(.*).vsix
+- name: s3-manifest-yaml-fatjar-snapshot
+  type: s3
+  source:
+    bucket: {{s3_bucket}}
+    access_key_id: {{s3_accesskey}}
+    secret_access_key: {{s3_secretkey}}
+    region_name: {{s3_region}}
+    regexp: sts4/fatjars/snapshots/manifest-yaml-language-server-(.*).jar
 - name: snapshot-website
   type: s3-multi
   source:
@@ -232,10 +240,15 @@ jobs:
       params:
         text: |
            Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!
-  - put: s3-manifest-yaml-vsix-snapshot
-    params: 
-      file: out/vscode-manifest-yaml-*.vsix
-      acl: public-read
+  - aggregate:
+    - put: s3-manifest-yaml-vsix-snapshot
+      params: 
+        file: out/vscode-manifest-yaml-*.vsix
+        acl: public-read
+    - put: s3-manifest-yaml-fatjar-snapshot
+      params: 
+        file: out/*.jar
+        acl: public-read
 - name: trigger-rc-build
   serial: true
   plan: 
diff --git a/concourse/tasks/build-vsix.sh b/concourse/tasks/build-vsix.sh
index d799492f1..d382e5477 100755
--- a/concourse/tasks/build-vsix.sh
+++ b/concourse/tasks/build-vsix.sh
@@ -2,6 +2,7 @@
 set -e
 workdir=`pwd`
 sources=$workdir/sts4/vscode-extensions/$extension_id
+server_id=${$extension_id/#vscode/}
 
 if [ -d "maven-cache" ]; then
     echo "Prepopulating maven cache"
@@ -48,3 +49,4 @@ if [ "$dist_type" == release ]; then
 fi
 
 cp *.vsix $workdir/out
+cp $workdir/sts4/headless-services/${server_id}-language-server/target/*.jar $workdir/out/${server_id}-language-server-${base_version}-${timestamp}.jar