diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72411e6..9401643 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,7 +107,6 @@ windows installer stable:
   script:
     - git fetch --tags
     - "& ./ci/build_gps.ps1"
-    - "& ./installer/wix/prepare_wix.ps1"
     - "& ./installer/wix/prepare_gstreamer.ps1"
     - "& ./installer/wix/build_installer.ps1"
   artifacts:
diff --git a/installer/wix/build_installer.ps1 b/installer/wix/build_installer.ps1
index f1d7106..0788f70 100644
--- a/installer/wix/build_installer.ps1
+++ b/installer/wix/build_installer.ps1
@@ -1,7 +1,19 @@
-$wixFolder = Join-Path $PSScriptRoot -ChildPath 'wix/'
+# Check wix installation
+$wixInstalledFolder = "C:\Program Files (x86)\Windows Installer XML v3.5\bin"
+if(Test-Path $wixInstalledFolder)
+{
+    $wixFolder = $wixInstalledFolder
+}
+else
+{
+    $prepareWix = Join-Path $PSScriptRoot -ChildPath prepare_wix.ps1
+    & "$prepareWix"
+    $wixFolder = Join-Path $PSScriptRoot -ChildPath 'wix/'
+}
 $candleToolPath = Join-Path $wixFolder -ChildPath candle.exe
 $lightToolPath = Join-Path $wixFolder -ChildPath light.exe
 $heatToolPath = Join-Path $wixFolder -ChildPath heat.exe
+
 $GPSUpgradeCode = "9B87C8FF-599C-4F20-914E-AF5E68CB3DC0"
 $GPSVersion = $(git describe --always --abbrev=0)
 Write-Output $GPSVersion