diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 1ae161eba..4bb632dc1 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -114,6 +114,14 @@ resources:
     secret_access_key: ((s3_secretkey))
     region_name: ((s3_region))
     regexp: sts4/vscode-extensions/snapshots/vscode-manifest-yaml-(.*).vsix
+- name: s3-spring-boot-vsix-snapshot
+  type: s3
+  source:
+    bucket: ((s3_bucket))
+    access_key_id: ((s3_accesskey))
+    secret_access_key: ((s3_secretkey))
+    region_name: ((s3_region))
+    regexp: sts4/vscode-extensions/snapshots/vscode-spring-boot-(.*).vsix
 - name: s3-manifest-yaml-fatjar-snapshot
   type: s3
   source:
@@ -404,30 +412,26 @@ jobs:
       params: 
         file: out/vscode-manifest-yaml-*.vsix
         acl: public-read
-- name: build-boot-vsix-snapshot
-  # This job is not yet properly / fully implemented. It only builds language-server-jar
+- name: build-spring-boot-vsix-snapshot
   plan:
   - aggregate:
     - get: sts4
       trigger: true
     - get: maven-cache
-  - task: build-language-server-jar
-    config:
-      inputs:
-      - name: sts4
-      platform: linux
-      image_resource:
-        type: docker-image
-        source:
-          repository: kdvolder/sts4-build-env
-      run:
-        dir: sts4/headless-services/boot-language-server
-        path: ./build.sh
+  - task: build-spring-boot-vsix-snapshot
+    file: sts4/concourse/tasks/build-vsix.yml
+    params:
+      extension_id: vscode-spring-boot
     on_failure:
       put: slack-notification
       params:
         text: |
            Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!
+  - aggregate:
+    - put: s3-spring-boot-vsix-snapshot
+      params: 
+        file: out/vscode-spring-boot-*.vsix
+        acl: public-read
 - name: trigger-rc-build
   serial: true
   plan: 
@@ -439,6 +443,7 @@ jobs:
       - build-bosh-vsix-snapshot
       - build-boot-java-vsix-snapshot
       - build-boot-properties-vsix-snapshot
+      - build-spring-boot-vsix-snapshot
     - do:
       - get: version
         params:
@@ -1162,7 +1167,7 @@ groups:
   - build-vscode-snapshot-website
   - build-consourse-vsix-snapshot
   - build-boot-properties-vsix-snapshot
-  - build-boot-vsix-snapshot
+  - build-spring-boot-vsix-snapshot
   - build-boot-java-vsix-snapshot
   - build-bosh-vsix-snapshot
   - build-manifest-yaml-vsix-snapshot
diff --git a/concourse/tasks/build-vscode-website.sh b/concourse/tasks/build-vscode-website.sh
index 3e94096bf..7fa13df8e 100755
--- a/concourse/tasks/build-vscode-website.sh
+++ b/concourse/tasks/build-vscode-website.sh
@@ -13,6 +13,8 @@ dist_type=snapshot
 
 export vscode_manifest_yaml=$(basename s3-manifest-yaml-vsix-${dist_type}/*.vsix)
 echo "vscode_manifest_yaml=$vscode_manifest_yaml"
+export vscode_spring_boot=$(basename s3-spring-boot-vsix-${dist_type}/*.vsix)
+echo "vscode_spring_boot=$vscode_spring_boot"
 export vscode_boot_properties=$(basename s3-boot-properties-vsix-${dist_type}/*.vsix)
 echo "vscode_boot_properties=$vscode_boot_properties"
 export vscode_boot_java=$(basename s3-boot-java-vsix-${dist_type}/*.vsix)
@@ -24,6 +26,9 @@ echo "vscode_bosh=$vscode_bosh"
 
 envsubst > "$target/vscode-extensions-snippet.html" << XXXXXX
 <ul>
+   <li>Spring Boot Language Server: 
+       <a href="http://s3-test.spring.io/sts4/vscode-extensions/${dist_type}s/${vscode_spring_boot}">${vscode_spring_boot}</a> 
+   </li>
    <li>Spring Boot Property Language Server: 
        <a href="http://s3-test.spring.io/sts4/vscode-extensions/${dist_type}s/${vscode_boot_properties}">${vscode_boot_properties}</a> 
    </li>
diff --git a/concourse/tasks/build-vscode-website.yml b/concourse/tasks/build-vscode-website.yml
index 6e0fb621d..81b1b5c21 100644
--- a/concourse/tasks/build-vscode-website.yml
+++ b/concourse/tasks/build-vscode-website.yml
@@ -1,6 +1,7 @@
 inputs:
 - name: sts4
 - name: s3-manifest-yaml-vsix-snapshot
+- name: s3-spring-boot-vsix-snapshot
 - name: s3-boot-properties-vsix-snapshot
 - name: s3-boot-java-vsix-snapshot
 - name: s3-concourse-vsix-snapshot