diff --git a/scripts/build.ts b/scripts/build.ts
index 945c9b22ef6c..b8f963613843 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -79,7 +79,7 @@ class Builder {
 
 		const vscodeSourcePath = path.join(this.outPath, "source", `vscode-${vscodeVersion}-source`);
 		const binariesPath = path.join(this.outPath, "binaries");
-		const binaryName = `code-server${codeServerVersion}-vsc${vscodeVersion}-${target}-${arch}`;
+		const binaryName = `code-server-${codeServerVersion}-${target}-${arch}`;
 		const finalBuildPath = path.join(this.outPath, "build", `${binaryName}-built`);
 
 		switch (task) {
@@ -231,7 +231,7 @@ class Builder {
 
 			const [productJson, packageJson] = await Promise.all([
 				merge("product", { commit, date }),
-				merge("package", { codeServerVersion: `${codeServerVersion}-vsc${vscodeVersion}` }),
+				merge("package", { codeServerVersion }),
 			]);
 
 			// We could do this before the optimization but then it'd be copied into
diff --git a/scripts/test.sh b/scripts/test.sh
index b8496130a9fa..e06488d20f3c 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -11,7 +11,9 @@ main() {
 	version=$(./binaries/code-server* --version | head -1)
 	echo "Got '$version' for the version"
 	case $version in
-		*-vsc1.41.1) exit 0 ;;
+	    # FIXME: this isn't semver compliant yet but its based on what our latest tag is!
+		*[0123456789].+[0123456789]) exit 0 ;;
+		*daily) echo "Assuming test builds, exiting."; exit 0 ;; 
 		*) exit 1 ;;
 	esac
 }
diff --git a/source/vscode-1.41.1-source b/source/vscode-1.41.1-source
new file mode 160000
index 000000000000..26076a4de974
--- /dev/null
+++ b/source/vscode-1.41.1-source
@@ -0,0 +1 @@
+Subproject commit 26076a4de974ead31f97692a0d32f90d735645c0