diff --git a/builder/build.ps1 b/builder/build.ps1
index 30411ba..1ea405f 100644
--- a/builder/build.ps1
+++ b/builder/build.ps1
@@ -21,8 +21,17 @@ Trap {
     # Reset working dir on error
     Pop-Location
 }
+# If signing, get the certificate
+if ($Sign) {
+    $cert=Get-ChildItem Cert:\CurrentUser\My -CodeSigningCert | Where-Object { $_.Thumbprint -eq $CertificateThumbprint }
+}
 
-$cert=Get-ChildItem Cert:\CurrentUser\My -CodeSigningCert | Where-Object { $_.Thumbprint -eq $CertificateThumbprint }
+# Building service executable
+Write-Output "Building WinBGP service"
+.\service\WinBGP-Service.ps1 -Build
+
+# Building engine
+Write-Output "Building engine"
 Get-ChildItem -Path '..\src' | Where-Object {$_.Extension -eq '.ps1'} |  ForEach-Object {
     Copy-Item -Path $_.FullName  -Destination "..\engine" -Force
     if ($Sign) {
@@ -30,12 +39,12 @@ Get-ChildItem -Path '..\src' | Where-Object {$_.Extension -eq '.ps1'} |  ForEach
     }
 }
 
-Write-Verbose "Creating winbgp-${Version}-${Arch}.msi"
+Write-Output "Creating winbgp-${Version}-${Arch}.msi"
 $wixArch = @{"amd64" = "x64"; "arm64" = "arm64"}[$Arch]
 
 Invoke-Expression "wix build -arch $wixArch -o .\WinBGP-$($Version)-$($Arch).msi .\files.wxs .\main.wxs -d ProductName=WinBGP -d Version=$($MsiVersion) -ext WixToolset.Firewall.wixext -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext"
 
-Write-Verbose "Done!"
+Write-Output "Done!"
 Pop-Location
 
 # Clean temporary build folder