diff --git a/concourse/tasks/build-vscode-extensions.sh b/concourse/tasks/build-vscode-extensions.sh
index 0d44656a1..c18fdfb05 100755
--- a/concourse/tasks/build-vscode-extensions.sh
+++ b/concourse/tasks/build-vscode-extensions.sh
@@ -6,9 +6,5 @@ cd sts4/vscode-extensions
 ./build-all.sh
 
 cd $workdir
-vsix_files=`find sts4 -name "*.visx"`
+cp `find sts4/vscode-extensions -name "*.vsix"` vsix-files
 
-for f in ${vsix_files}; do
-    new_name = $(basename "$f" .vsix)-`date -u +%Y%m%d%H%M`
-    mv "$f" "vsix_files/$new_name"
-done
diff --git a/vscode-extensions/build-all.sh b/vscode-extensions/build-all.sh
index cff2b14aa..9b5ce432a 100755
--- a/vscode-extensions/build-all.sh
+++ b/vscode-extensions/build-all.sh
@@ -2,6 +2,9 @@
 set -e
 
 base_dir=`pwd`
+
+timestamp=`date -u +%Y%m%d%H%M`
+
 cd ${base_dir}/commons-vscode
 npm install
 
@@ -17,6 +20,11 @@ for i in vscode-boot-properties vscode-manifest-yaml ; do
     echo "***************************************************************************************"
     
     npm install ../commons-vscode
+
+    base_version=`jq -r .version package.json`
+    qualified_version=${base_version}-${timestamp}
+
+    npm version ${qualified_version}
     npm install
     npm run vsce-package
 done