diff --git a/.github/workflows/publish-extension.yml b/.github/workflows/publish-extension.yml
index 892b3095..35a3241c 100644
--- a/.github/workflows/publish-extension.yml
+++ b/.github/workflows/publish-extension.yml
@@ -23,7 +23,7 @@ jobs:
           npm install -g vsce
       - name: Build vsix package
         run: |
-          vsce package
+          npm run createpkg-nightly
       # TODO Enable publish job
       - name: Publish vsix package
         if: ${{ false }}
diff --git a/package.json b/package.json
index 06c51698..f7d475d1 100644
--- a/package.json
+++ b/package.json
@@ -457,7 +457,9 @@
     "test": "npm run unittest",
     "test-no-screen": "DISPLAY=:44 xvfb-run --server-num 44 npm run test",
     "coverage": "npm run test coverage",
-    "clean": "rm -rf out"
+    "clean": "rm -rf out",
+    "createpkg-local": "vsce package -o one-vscode-local-$(git rev-parse --short HEAD)-$(date '+%Y%m%d%H%M%S').vsix",
+    "createpkg-nightly": "VER=$(npm version --no-git-tag-version --no-commit-hooks minor | cut -c2-) && vsce package  --no-git-tag-version ${VER}-$(git rev-parse --short HEAD)"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",