diff --git a/Build-SampleSet.ps1 b/Build-SampleSet.ps1
index 2c75143a6..b1489e20f 100644
--- a/Build-SampleSet.ps1
+++ b/Build-SampleSet.ps1
@@ -51,10 +51,10 @@ finally {
 $build_environment=""
 $build_number=0
 #
-# EWDK sets environment variable Version_Number.  For example '10.0.22621.0'.
+# EWDK sets environment variable BuildLab.  For example 'ni_release_svc_prod1.22621.2428'.
 #
-if($env:Version_Number -match '10.0.(?<build>.*).0') {
-    $build_environment="EWDK"
+if($env:BuildLab -match '(?<branch>[^.]*).(?<build>[^.]*).(?<qfe>[^.]*)') {
+    $build_environment=("EWDK."+$Matches.branch+"."+$Matches.build+"."+$Matches.qfe)
     $build_number=$Matches.build
 }
 #