diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 3a3bf47a2..3ef339eea 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -519,6 +519,18 @@ jobs:
       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: 
@@ -787,10 +799,10 @@ jobs:
         text: |
           STS 4 VScode Extensions $TEXT_FILE_CONTENT released
           Releases now available on Vscode Marketplace:
-           • <https://marketplace.visualstudio.com/items?itemName=Pivotal.vscode-manifest-yaml|Cloudfoundry Manifest Editor>
-           • <https://marketplace.visualstudio.com/items?itemName=Pivotal.vscode-concourse|Concourse CI Pipeline Editor>
-           • <https://marketplace.visualstudio.com/items?itemName=Pivotal.vscode-bosh|Bosh Deployment Manifest Editor>
-           • <https://marketplace.visualstudio.com/items?itemName=Pivotal.vscode-spring-boot|Spring Boot Support>
+           • <https://marketplace.visualstudio.com/items?itemName=vmware.vscode-manifest-yaml|Cloudfoundry Manifest Editor>
+           • <https://marketplace.visualstudio.com/items?itemName=vmware.vscode-concourse|Concourse CI Pipeline Editor>
+           • <https://marketplace.visualstudio.com/items?itemName=vmware.vscode-bosh|Bosh Deployment Manifest Editor>
+           • <https://marketplace.visualstudio.com/items?itemName=vmware.vscode-spring-boot|Spring Boot Support>
   - in_parallel:
     - put: sts4-out
       params:
diff --git a/concourse/tasks/build-vsix.sh b/concourse/tasks/build-vsix.sh
index fa72e751c..c078809fc 100755
--- a/concourse/tasks/build-vsix.sh
+++ b/concourse/tasks/build-vsix.sh
@@ -34,7 +34,7 @@ fi
 ./scripts/preinstall.sh
 npm install
 #npm audit
-npm run vsce-package
+npm run vsce-pre-release-package
 
 # 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
diff --git a/concourse/tasks/publish-vsix-pre-releases.sh b/concourse/tasks/publish-vsix-pre-releases.sh
new file mode 100644
index 000000000..9829c4a1c
--- /dev/null
+++ b/concourse/tasks/publish-vsix-pre-releases.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+workdir=`pwd`
+
+vsix_files=`ls ${workdir}/vsix_folder/vscode-*.vsix`
+
+for vsix_file in $vsix_files
+do
+    echo "****************************************************************"
+    echo "*** Pre-Release Publishing : ${vsix_file}"
+    echo "****************************************************************"
+    echo ""
+    echo "We are runing the following command:"
+    echo ""
+    echo "     vsce publish --pre-release -p vsce_token --packagePath $vsix_file"
+    echo ""
+    vsce publish --pre-release -p $vsce_token --packagePath $vsix_file
+done
diff --git a/concourse/tasks/publish-vsix-pre-releases.yml b/concourse/tasks/publish-vsix-pre-releases.yml
new file mode 100644
index 000000000..789f71d08
--- /dev/null
+++ b/concourse/tasks/publish-vsix-pre-releases.yml
@@ -0,0 +1,12 @@
+platform: linux
+inputs:
+- name: sts4
+- name: vsix_folder
+run:
+  path: sts4/concourse/tasks/publish-pre-release.yml
+image_resource:
+  type: registry-image
+  source:
+    username: ((docker_hub_username))
+    password: ((docker_hub_password))
+    repository: springci/sts4-build-env
diff --git a/concourse/tasks/rc-build.sh b/concourse/tasks/rc-build.sh
index 2778eb1ff..7f82a98b0 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-package
+npm run vsce-release-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/vscode-bosh/package.json b/vscode-extensions/vscode-bosh/package.json
index 7e618e82e..9bfc06f0c 100644
--- a/vscode-extensions/vscode-bosh/package.json
+++ b/vscode-extensions/vscode-bosh/package.json
@@ -122,7 +122,8 @@
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "clean": "rm -fr node_modules out *.vsix package-lock.json",
-    "vsce-package": "vsce package"
+    "vsce-release-package": "vsce package",
+    "vsce-pre-release-package": "vsce package --pre-release"
   },
   "dependencies": {
     "@pivotal-tools/commons-vscode": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.4.tgz",
diff --git a/vscode-extensions/vscode-concourse/build.sh b/vscode-extensions/vscode-concourse/build.sh
index dd59f919a..f039aed76 100755
--- a/vscode-extensions/vscode-concourse/build.sh
+++ b/vscode-extensions/vscode-concourse/build.sh
@@ -2,7 +2,12 @@
 set -e
 ./scripts/preinstall.sh
 npm install
-npm run vsce-package
+if [ "$1" = "release" ]
+then
+  npm run vsce-release-package
+else
+  npm run vsce-pre-release-package
+fi
 rm -fr ~/.vscode/extensions/pivotal.vscode-concourse*
 rm -fr ~/.vscode/extensions/.obsolete
 code --install-extension vscode-concourse-*.vsix
diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json
index 6922d7138..ebc04211f 100644
--- a/vscode-extensions/vscode-concourse/package.json
+++ b/vscode-extensions/vscode-concourse/package.json
@@ -123,7 +123,8 @@
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "clean": "rm -fr node_modules out *.vsix package-lock.json",
-    "vsce-package": "vsce package"
+    "vsce-release-package": "vsce package",
+    "vsce-pre-release-package": "vsce package --pre-release"
   },
   "dependencies": {
     "@pivotal-tools/commons-vscode": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.4.tgz",
diff --git a/vscode-extensions/vscode-manifest-yaml/build.sh b/vscode-extensions/vscode-manifest-yaml/build.sh
index 3687cd8df..ea35caaaf 100755
--- a/vscode-extensions/vscode-manifest-yaml/build.sh
+++ b/vscode-extensions/vscode-manifest-yaml/build.sh
@@ -2,7 +2,12 @@
 set -e
 ./scripts/preinstall.sh
 npm install
-npm run vsce-package
+if [ "$1" = "release" ]
+then
+  npm run vsce-release-package
+else
+  npm run vsce-pre-release-package
+fi
 rm -fr ~/.vscode/extensions/pivotal.vscode-manifest-yaml*
 rm -fr ~/.vscode/extensions/.obsolete
 code --install-extension vscode-*.vsix
diff --git a/vscode-extensions/vscode-manifest-yaml/package.json b/vscode-extensions/vscode-manifest-yaml/package.json
index cdd20643b..127c5a7bd 100644
--- a/vscode-extensions/vscode-manifest-yaml/package.json
+++ b/vscode-extensions/vscode-manifest-yaml/package.json
@@ -86,7 +86,8 @@
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "clean": "rm -fr node_modules out *.vsix package-lock.json",
-    "vsce-package": "vsce package"
+    "vsce-release-package": "vsce package",
+    "vsce-pre-release-package": "vsce package --pre-release"
   },
   "dependencies": {
     "@pivotal-tools/commons-vscode": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.4.tgz",
diff --git a/vscode-extensions/vscode-spring-boot/build.sh b/vscode-extensions/vscode-spring-boot/build.sh
index d3a9781fc..fab88dfc3 100755
--- a/vscode-extensions/vscode-spring-boot/build.sh
+++ b/vscode-extensions/vscode-spring-boot/build.sh
@@ -28,6 +28,11 @@ cd $workdir
 ./scripts/preinstall.sh
 npm install
 rm -fr *.vsix
-npm run vsce-package
+if [ "$1" = "release" ]
+then
+  npm run vsce-release-package
+else
+  npm run vsce-pre-release-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 8ba96593c..fc446794c 100644
--- a/vscode-extensions/vscode-spring-boot/package.json
+++ b/vscode-extensions/vscode-spring-boot/package.json
@@ -893,7 +893,8 @@
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
     "test": "npm run compile && node ./node_modules/vscode/bin/test",
-    "vsce-package": "vsce package"
+    "vsce-release-package": "vsce package",
+    "vsce-pre-release-package": "vsce package --pre-release"
   },
   "dependencies": {
     "@pivotal-tools/commons-vscode": "file:../commons-vscode/pivotal-tools-commons-vscode-0.2.4.tgz",