diff --git a/.gitignore b/.gitignore
index d9b02fc89..6574e1a95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ coverity.zip
 #sonarqube
 /.sonarqube
 !tools/sonarqube/**/*
+!tools/CxxSonarQubeMsbuidRunner.exe
 /main/.sonarqube
 /main/.cxxresults
 /tools/sonarqube/cxx-runner
diff --git a/default.build b/default.build
index 069b261a0..431360c25 100644
--- a/default.build
+++ b/default.build
@@ -121,17 +121,18 @@
   <target name="sonarqube-build" if="${environment::variable-exists('SONARQUBE_USER')}">
 
     <call target="sonarqube-build-ci" />
-
-    <call target="reset-private-vars" />
   
     <call target="dogfood-release" />
+
+    <call target="reset-private-vars" />
     
     <exec program="${tools.folder}/7-Zip/7za.exe" unless="${directory::exists('tools\sonarqube\cxx-runner')}">
 			<arg value="x" />
 			<arg value="-otools\sonarqube\cxx-runner" />
 			<arg value="tools\CxxSonarQubeMsbuidRunner.zip" />
 		</exec>
- 
+
+    <copy file="tools\CxxSonarQubeMsbuidRunner.exe" tofile="tools\sonarqube\cxx-runner\CxxSonarQubeMsbuidRunner.exe" />
     
     <!-- assumes coverage file has been created -->
     <exec program="tools\sonarqube\cxx-runner\CxxSonarQubeMsbuidRunner.exe" commandline='/m:main\opencover.sln /x:vs13 /q:tools\sonarqube\runner\MSBuild.SonarQube.Runner.exe /n:opencover /k:opencover /p:Configuration=release,Platform=x64,GtestRunnerTaskEnabled=false /v:"${ci.fullBuildNumber}" /d:sonar.cs.opencover.reportsPaths="${root.folder}\main\bin\release\opencovertests.xml"' />
diff --git a/tools/CxxSonarQubeMsbuidRunner.exe b/tools/CxxSonarQubeMsbuidRunner.exe
new file mode 100644
index 000000000..509030959
Binary files /dev/null and b/tools/CxxSonarQubeMsbuidRunner.exe differ