diff --git a/build/VStudio/build.version.props b/build/VStudio/build.version.props
index 537f1da3..b84ab644 100644
--- a/build/VStudio/build.version.props
+++ b/build/VStudio/build.version.props
@@ -23,6 +23,9 @@
         <MyProductVersion>2022+ARM64 Beta1</MyProductVersion>
         <MyProductStage>Beta</MyProductStage>
 
+        <MyCrossCert>DigiCert High Assurance EV Root CA.crt</MyCrossCert>
+        <MyCertIssuer>DigiCert</MyCertIssuer>
+
         <MyVersion>$(MyCanonicalVersion).$(MyBuildNumber)</MyVersion>
         <MyVersionWithCommas>$(MyVersion.Replace('.',',')),0</MyVersionWithCommas>
         <MyFullVersion>$(MyCanonicalVersion).$(MyBuildNumber).$(MyGitRevision)</MyFullVersion>
diff --git a/tools/build-choco.bat b/tools/build-choco.bat
index ba6660e0..3f6dd851 100755
--- a/tools/build-choco.bat
+++ b/tools/build-choco.bat
@@ -6,8 +6,8 @@ setlocal EnableDelayedExpansion
 call "%~dp0myinfo.bat"
 
 set MsiName="%MyProductName% - %MyDescription%"
-set CrossCert="%~dp0DigiCert High Assurance EV Root CA.crt"
-set Issuer="DigiCert"
+set CrossCert="%~dp0%MyCrossCert%"
+set Issuer="%MyCertIssuer%"
 set Subject="%MyCompanyName%"
 
 set Configuration=Release
diff --git a/tools/build.bat b/tools/build.bat
index ba6660e0..3f6dd851 100755
--- a/tools/build.bat
+++ b/tools/build.bat
@@ -6,8 +6,8 @@ setlocal EnableDelayedExpansion
 call "%~dp0myinfo.bat"
 
 set MsiName="%MyProductName% - %MyDescription%"
-set CrossCert="%~dp0DigiCert High Assurance EV Root CA.crt"
-set Issuer="DigiCert"
+set CrossCert="%~dp0%MyCrossCert%"
+set Issuer="%MyCertIssuer%"
 set Subject="%MyCompanyName%"
 
 set Configuration=Release
diff --git a/tools/myinfo.bat b/tools/myinfo.bat
index f384d4ac..6ea0d1f6 100644
--- a/tools/myinfo.bat
+++ b/tools/myinfo.bat
@@ -14,6 +14,10 @@ for /F "tokens=2,3,4 delims=<>" %%a in (%~dp0..\build\VStudio\build.version.prop
             set MyProductVersion=%%b
         ) else if "%%a"=="MyProductStage" (
             set MyProductStage=%%b
+        ) else if "%%a"=="MyCrossCert" (
+            set MyCrossCert=%%b
+        ) else if "%%a"=="MyCertIssuer" (
+            set MyCertIssuer=%%b
         )
     )
 )
@@ -24,3 +28,5 @@ echo MyDescription=%MyDescription%
 echo MyCompanyName=%MyCompanyName%
 echo MyProductVersion=%MyProductVersion%
 echo MyProductStage=%MyProductStage%
+echo MyCrossCert=%MyCrossCert%
+echo MyCertIssuer=%MyCertIssuer%