diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 23e574dab..a11330ffa 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -512,9 +512,10 @@ jobs:
       trigger: true
     - get: maven-cache
   - task: build-manifest-yaml-vsix-snapshot
-    file: sts4/concourse/tasks/build-vsix-pre-release.yml
+    file: sts4/concourse/tasks/build-vsix.yml
     params:
       extension_id: vscode-manifest-yaml
+      dist_type: pre
     on_failure:
       put: slack-notification
       params:
@@ -915,10 +916,10 @@ jobs:
       trigger: true
       passed:
       - build-bosh-vsix-snapshot
-    - get: s3-manifest-yaml-vsix-snapshot
-      trigger: true
-      passed:
-      - build-manifest-yaml-vsix-snapshot
+    # - get: s3-manifest-yaml-vsix-snapshot
+    #   trigger: true
+    #   passed:
+    #   - build-manifest-yaml-vsix-snapshot
     - get: s3-spring-boot-vsix-snapshot
       trigger: true
       passed:
diff --git a/concourse/tasks/build-vscode-website.sh b/concourse/tasks/build-vscode-website.sh
index 319ca3606..125c0f6eb 100755
--- a/concourse/tasks/build-vscode-website.sh
+++ b/concourse/tasks/build-vscode-website.sh
@@ -10,8 +10,8 @@ dist_type=snapshot
 #cp -r ${sources}/*.js "$target"
 #cp s3-manifest-yaml-vsix/*.vsix "$target"
 
-export vscode_manifest_yaml=$(basename s3-manifest-yaml-vsix-${dist_type}/*.vsix)
-echo "vscode_manifest_yaml=$vscode_manifest_yaml"
+# 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_concourse=$(basename s3-concourse-vsix-${dist_type}/*.vsix)
@@ -24,9 +24,6 @@ envsubst > "$target/vscode-extensions-snippet.html" << XXXXXX
    <li>Spring Boot Language Server: 
        <a href="https://s3-us-west-1.amazonaws.com/s3-test.spring.io/sts4/vscode-extensions/${dist_type}s/${vscode_spring_boot}">${vscode_spring_boot}</a> 
    </li>
-   <li>Cloud Foundry Manifest Language Server: 
-       <a href="https://s3-us-west-1.amazonaws.com/s3-test.spring.io/sts4/vscode-extensions/${dist_type}s/${vscode_manifest_yaml}">${vscode_manifest_yaml}</a> 
-   </li>
    <li>Concourse CI Language Server: 
        <a href="https://s3-us-west-1.amazonaws.com/s3-test.spring.io/sts4/vscode-extensions/${dist_type}s/${vscode_concourse}">${vscode_concourse}</a> 
    </li>
diff --git a/concourse/tasks/build-vsix-pre-release.sh b/concourse/tasks/build-vsix-pre-release.sh
deleted file mode 100755
index f2c91771f..000000000
--- a/concourse/tasks/build-vsix-pre-release.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-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"
-    tar xzf maven-cache/*.tar.gz -C ${HOME}
-else
-   echo "!!!No stored maven cache found!!! "
-   echo "!!!This may slow down the build!!!"
-fi
-
-#cd ${sources}/../commons-vscode
-#npm install
-
-cd "$sources"
-
-#npm install ../commons-vscode
-
-timestamp=`date -u +%Y%m%d%H%M`
-
-version=`jq -r .version package.json`
-echo -e "\n\n*Version: ${version}-PRE-RELEASE*" >> README.md
-
-./scripts/preinstall.sh
-npm install
-#npm audit
-npm run vsce-pre-release-package
-
-cp *.vsix $workdir/out
-server_jar=$workdir/sts4/headless-services/${server_id}-language-server/target/*-exec.jar
-if [ -f $server_jar ]; then
-    cp $server_jar $workdir/out/${server_id}-language-server-${version}-${timestamp}.jar
-fi
diff --git a/concourse/tasks/build-vsix-pre-release.yml b/concourse/tasks/build-vsix-pre-release.yml
deleted file mode 100644
index 19766fab3..000000000
--- a/concourse/tasks/build-vsix-pre-release.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-inputs:
-- name: sts4
-- name: maven-cache
-outputs:
-- name: out
-platform: linux
-image_resource:
-  type: registry-image
-  source:
-    username: ((docker_hub_username))
-    password: ((docker_hub_password))
-    repository: springci/sts4-build-env
-run:
-  path: sts4/concourse/tasks/build-vsix-pre-release.sh
diff --git a/concourse/tasks/build-vsix.sh b/concourse/tasks/build-vsix.sh
index bcf13beb8..6c6274906 100755
--- a/concourse/tasks/build-vsix.sh
+++ b/concourse/tasks/build-vsix.sh
@@ -22,19 +22,27 @@ cd "$sources"
 timestamp=`date -u +%Y%m%d%H%M`
 
 base_version=`jq -r .version package.json`
-if [ "$dist_type" != release ]; then
-    # for snapshot build, work the timestamp into package.json version qualifier
-    qualified_version=${base_version}-${timestamp}
-    npm version ${qualified_version}
-    echo -e "\n\n*Version: ${qualified_version}*" >> README.md
-else
+if [ "$dist_type" = release ]; then
     echo -e "\n\n*Version: ${base_version}-RELEASE*" >> README.md
+else
+    if [ "$dist_type" = pre ]; then
+        echo -e "\n\n*Version: ${base_version}-PRE-RELEASE*" >> README.md
+    else
+        # for snapshot build, work the timestamp into package.json version qualifier
+        qualified_version=${base_version}-${timestamp}
+        npm version ${qualified_version}
+        echo -e "\n\n*Version: ${qualified_version}*" >> README.md
+    fi
 fi
 
 ./scripts/preinstall.sh
 npm install
 #npm audit
-npm run vsce-release-package
+if [ "$dist_type" = pre ]; then
+    npm run vsce-pre-release-package
+else
+    npm run vsce-release-package
+fi
 
 # for release build we don't don't add version-qualifier to package.json
 # So we must instead rename the file ourself to add a qualifier