diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index a11330ffa..7d69472d3 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -507,7 +507,6 @@ jobs:
 - name: build-manifest-yaml-vsix-snapshot
   plan:
   - in_parallel:
-    - get: tasks
     - get: sts4
       trigger: true
     - get: maven-cache
@@ -515,24 +514,16 @@ jobs:
     file: sts4/concourse/tasks/build-vsix.yml
     params:
       extension_id: vscode-manifest-yaml
-      dist_type: pre
     on_failure:
       put: slack-notification
       params:
         text: |
            Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!
-  - task: publish-pre-release
-    file: sts4/concourse/tasks/publish-vsix-pre-releases.yml
-    input_mapping:
-      sts4: tasks
-      vsix_folder: out 
-    params:
-      vsce_token: ((vsce_token))
-    on_failure:
-      put: slack-notification
-      params:
-        text: |
-           Pre-Release Publishing for ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!      
+  - in_parallel:
+    - put: s3-manifest-yaml-vsix-snapshot
+      params: 
+        file: out/vscode-manifest-yaml-*.vsix
+        acl: public-read      
 - name: build-spring-boot-vsix-snapshot
   plan:
   - in_parallel:
@@ -916,10 +907,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 125c0f6eb..319ca3606 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,6 +24,9 @@ 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-vscode-website.yml b/concourse/tasks/build-vscode-website.yml
index 3d7591f08..0c0e1759f 100644
--- a/concourse/tasks/build-vscode-website.yml
+++ b/concourse/tasks/build-vscode-website.yml
@@ -1,6 +1,6 @@
 inputs:
 - name: sts4
-# - name: s3-manifest-yaml-vsix-snapshot
+- name: s3-manifest-yaml-vsix-snapshot
 - name: s3-spring-boot-vsix-snapshot
 - name: s3-concourse-vsix-snapshot
 - name: s3-bosh-vsix-snapshot
diff --git a/concourse/tasks/build-vsix.sh b/concourse/tasks/build-vsix.sh
index dc9e5df57..b722f809b 100755
--- a/concourse/tasks/build-vsix.sh
+++ b/concourse/tasks/build-vsix.sh
@@ -19,19 +19,19 @@ cd "$sources"
 
 #npm install ../commons-vscode
 
-timestamp=`date -u +%Y%m%d%H%M`
-
 base_version=`jq -r .version package.json`
 if [ "$dist_type" = release ]; then
     echo -e "\n\n*Version: ${base_version}-RELEASE*" >> README.md
 else
     if [ "$dist_type" = pre ]; then
-        # for pre-release build, work the timestamp into package.json patch version (
+        # for pre-release build, work the timestamp into package.json patch version. No minutes in the timestamp due VSCode pre-release lack of support for semver
+        timestamp=`date -u +%Y%m%d%H`
         qualified_version=`echo $base_version | sed "s/\([0-9]\{1,\}.[0-9]\{1,\}.\)[0-9]\{1,\}/\1$timestamp/"`
         npm version ${qualified_version}
         echo -e "\n\n*Version: ${base_version}-PRE-RELEASE*" >> README.md
     else
         # for snapshot build, work the timestamp into package.json version qualifier
+        timestamp=`date -u +%Y%m%d%H%M`
         qualified_version=${base_version}-${timestamp}
         npm version ${qualified_version}
         echo -e "\n\n*Version: ${qualified_version}*" >> README.md
@@ -44,7 +44,7 @@ npm install
 if [ "$dist_type" = pre ]; then
     npm run vsce-pre-release-package
 else
-    npm run vsce-release-package
+    npm run vsce-package
 fi
 
 # for release build we don't don't add version-qualifier to package.json
diff --git a/concourse/tasks/rc-build.sh b/concourse/tasks/rc-build.sh
index 7f82a98b0..2778eb1ff 100755
--- a/concourse/tasks/rc-build.sh
+++ b/concourse/tasks/rc-build.sh
@@ -36,7 +36,7 @@ echo -e "\n\n*Version: ${version}*" >> README.md
 cd "$sources"
 ./scripts/preinstall.sh
 npm install
-npm run vsce-release-package
+npm run vsce-package
 
 #Because the RC was with a unqualified version...
 #The RC version qualifier isn't automaticlaly present in the file name.
diff --git a/vscode-extensions/commons-vscode/package-lock.json b/vscode-extensions/commons-vscode/package-lock.json
index 6435c3f9f..09efd303c 100644
--- a/vscode-extensions/commons-vscode/package-lock.json
+++ b/vscode-extensions/commons-vscode/package-lock.json
@@ -21,7 +21,7 @@
       },
       "engines": {
         "npm": ">=3.0.0",
-        "vscode": "^1.67"
+        "vscode": "^1.67.0"
       }
     },
     "node_modules/@pivotal-tools/jvm-launch-utils": {
diff --git a/vscode-extensions/vscode-bosh/package.json b/vscode-extensions/vscode-bosh/package.json
index 02191d89b..a024b9ab0 100644
--- a/vscode-extensions/vscode-bosh/package.json
+++ b/vscode-extensions/vscode-bosh/package.json
@@ -122,7 +122,7 @@
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "clean": "rm -fr node_modules out *.vsix package-lock.json",
-    "vsce-release-package": "vsce package",
+    "vsce-package": "vsce package",
     "vsce-pre-release-package": "vsce package --pre-release"
   },
   "dependencies": {
diff --git a/vscode-extensions/vscode-concourse/build.sh b/vscode-extensions/vscode-concourse/build.sh
index f039aed76..3f1fab424 100755
--- a/vscode-extensions/vscode-concourse/build.sh
+++ b/vscode-extensions/vscode-concourse/build.sh
@@ -2,11 +2,11 @@
 set -e
 ./scripts/preinstall.sh
 npm install
-if [ "$1" = "release" ]
+if [ "$1" = "pre-release" ]
 then
-  npm run vsce-release-package
-else
   npm run vsce-pre-release-package
+else
+  npm run vsce-package
 fi
 rm -fr ~/.vscode/extensions/pivotal.vscode-concourse*
 rm -fr ~/.vscode/extensions/.obsolete
diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json
index acf56b459..5d3cf2bdd 100644
--- a/vscode-extensions/vscode-concourse/package.json
+++ b/vscode-extensions/vscode-concourse/package.json
@@ -123,7 +123,7 @@
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "clean": "rm -fr node_modules out *.vsix package-lock.json",
-    "vsce-release-package": "vsce package",
+    "vsce-package": "vsce package",
     "vsce-pre-release-package": "vsce package --pre-release"
   },
   "dependencies": {
diff --git a/vscode-extensions/vscode-manifest-yaml/build.sh b/vscode-extensions/vscode-manifest-yaml/build.sh
index ea35caaaf..d8da62521 100755
--- a/vscode-extensions/vscode-manifest-yaml/build.sh
+++ b/vscode-extensions/vscode-manifest-yaml/build.sh
@@ -2,11 +2,11 @@
 set -e
 ./scripts/preinstall.sh
 npm install
-if [ "$1" = "release" ]
+if [ "$1" = "pre-release" ]
 then
-  npm run vsce-release-package
-else
   npm run vsce-pre-release-package
+else
+  npm run vsce-package
 fi
 rm -fr ~/.vscode/extensions/pivotal.vscode-manifest-yaml*
 rm -fr ~/.vscode/extensions/.obsolete
diff --git a/vscode-extensions/vscode-manifest-yaml/package.json b/vscode-extensions/vscode-manifest-yaml/package.json
index 7d306879e..8d40ce9dc 100644
--- a/vscode-extensions/vscode-manifest-yaml/package.json
+++ b/vscode-extensions/vscode-manifest-yaml/package.json
@@ -86,7 +86,7 @@
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "clean": "rm -fr node_modules out *.vsix package-lock.json",
-    "vsce-release-package": "vsce package",
+    "vsce-package": "vsce package",
     "vsce-pre-release-package": "vsce package --pre-release"
   },
   "dependencies": {
diff --git a/vscode-extensions/vscode-spring-boot/build.sh b/vscode-extensions/vscode-spring-boot/build.sh
index fab88dfc3..26829031a 100755
--- a/vscode-extensions/vscode-spring-boot/build.sh
+++ b/vscode-extensions/vscode-spring-boot/build.sh
@@ -28,11 +28,11 @@ cd $workdir
 ./scripts/preinstall.sh
 npm install
 rm -fr *.vsix
-if [ "$1" = "release" ]
+if [ "$1" = "pre-release" ]
 then
-  npm run vsce-release-package
-else
   npm run vsce-pre-release-package
+else
+  npm run vsce-package
 fi
 rm -fr ${home}/.vscode/extensions/*vscode-spring-boot-*
 code --install-extension *.vsix
diff --git a/vscode-extensions/vscode-spring-boot/package.json b/vscode-extensions/vscode-spring-boot/package.json
index 0dffe4260..0d5bf125c 100644
--- a/vscode-extensions/vscode-spring-boot/package.json
+++ b/vscode-extensions/vscode-spring-boot/package.json
@@ -893,7 +893,7 @@
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "test": "npm run compile && node ./node_modules/vscode/bin/test",
-    "vsce-release-package": "vsce package",
+    "vsce-package": "vsce package",
     "vsce-pre-release-package": "vsce package --pre-release"
   },
   "dependencies": {