diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b7ac3238..1f869daf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -35,6 +35,7 @@ jobs:
       THEIA_ELECTRON_SKIP_REPLACE_FFMPEG: 1
     displayName: Build
   - bash: |
+      ./electron/packager/conf-node-gyp.sh
       yarn --cwd ./electron/packager/
       yarn --cwd ./electron/packager/ package
     env:
diff --git a/electron/packager/conf-node-gyp.sh b/electron/packager/conf-node-gyp.sh
new file mode 100755
index 00000000..89c41ed1
--- /dev/null
+++ b/electron/packager/conf-node-gyp.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+npm install --global node-gyp@6.0.1
+
+if [ "$OSTYPE" = "cygwin" ] || [ "$OSTYPE" = "msys" ]; then
+    npm config set node_gyp "`npm prefix -g`\node_modules\node-gyp\bin\node-gyp.js"
+else
+    npm config set node_gyp "`npm prefix -g`/lib/node_modules/node-gyp/bin/node-gyp.js"
+fi
+
+echo "npm config get node_gyp -> `npm config get node_gyp`"
diff --git a/electron/packager/utils.js b/electron/packager/utils.js
index ea54b744..ac534b4b 100644
--- a/electron/packager/utils.js
+++ b/electron/packager/utils.js
@@ -13,7 +13,7 @@ const depcheck = require('depcheck');
  * and append the short commit SHA.
  */
 function versionInfo() {
-    if (typeof process.env.RELEASE_TAG === 'undefined' || /* Azure -> */ process.env.RELEASE_TAG === '$(Release.Tag)') {
+    if (typeof process.env.RELEASE_TAG === 'undefined' || !process.env.RELEASE_TAG || /* Azure -> */ process.env.RELEASE_TAG === '$(Release.Tag)') {
         return {
             version: `${targetVersion()}-${currentCommitish()}`,
             release: false
@@ -97,4 +97,4 @@ function collectUnusedDependencies(pathToProject = process.cwd()) {
     })
 }
 
-module.exports = { versionInfo, collectUnusedDependencies };
\ No newline at end of file
+module.exports = { versionInfo, collectUnusedDependencies };