diff --git a/References/Windows/WintunInstaller/WintunInstaller_x86.wxs b/References/Windows/WintunInstaller/WintunInstaller_x86.wxs
deleted file mode 100644
index a527b4c..0000000
--- a/References/Windows/WintunInstaller/WintunInstaller_x86.wxs
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="WintunInstaller_x86_64" Language="1033" Version="1.0.0.0" Manufacturer="www.ivpn.net" UpgradeCode="b2a2baff-b6e8-4c75-a247-e73bcd2ecded">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
-
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-		<MediaTemplate />
-
-		<Feature Id="ProductFeature" Title="WintunInstaller_x86_64" Level="1">
-			<ComponentGroupRef Id="ProductComponents" />
-		</Feature>
-
-    <!--Wintun driver-->
-    <DirectoryRef Id="INSTALLFOLDER">
-      <Merge Id="WintunMergeModule" Language="0" DiskId="1" SourceFile=".deps\wintun-x86.msm" />
-    </DirectoryRef>
-    <Feature Id="WintunFeature" Title="Wintun" Level="1">
-      <MergeRef Id="WintunMergeModule" />
-    </Feature>
-
-    <!--Do not show in Add\Remove programs-->
-    <Property Id="ARPSYSTEMCOMPONENT" Value="1" />
-  
-	</Product>
-
-	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="ProgramFilesFolder">
-				<Directory Id="INSTALLFOLDER" Name="WintunInstaller_x86_64" />
-			</Directory>
-		</Directory>
-	</Fragment>
-
-	<Fragment>
-		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
-			<!-- <Component Id="ProductComponent"> -->
-				<!-- TODO: Insert files, registry keys, and other resources here. -->
-			<!-- </Component> -->
-		</ComponentGroup>
-	</Fragment>
-</Wix>
diff --git a/References/Windows/WintunInstaller/WintunInstaller_x86_64.wxs b/References/Windows/WintunInstaller/WintunInstaller_x86_64.wxs
deleted file mode 100644
index 9014e0b..0000000
--- a/References/Windows/WintunInstaller/WintunInstaller_x86_64.wxs
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="WintunInstaller_x86_64" Language="1033" Version="1.0.0.0" Manufacturer="www.ivpn.net" UpgradeCode="b2a2baff-b6e8-4c75-a247-e73bcd2ecded">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform='x64'/>
-
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-		<MediaTemplate />
-
-		<Feature Id="ProductFeature" Title="WintunInstaller_x86_64" Level="1">
-			<ComponentGroupRef Id="ProductComponents" />
-		</Feature>
-
-    <!--Wintun driver-->
-    <DirectoryRef Id="INSTALLFOLDER">
-      <Merge Id="WintunMergeModule" Language="0" DiskId="1" SourceFile=".deps\wintun-amd64.msm" />
-    </DirectoryRef>
-    <Feature Id="WintunFeature" Title="Wintun" Level="1">
-      <MergeRef Id="WintunMergeModule" />
-    </Feature>
-
-    <!--Do not show in Add\Remove programs-->
-    <Property Id="ARPSYSTEMCOMPONENT" Value="1" />
-  
-	</Product>
-
-	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="ProgramFilesFolder">
-				<Directory Id="INSTALLFOLDER" Name="WintunInstaller_x86_64" />
-			</Directory>
-		</Directory>
-	</Fragment>
-
-	<Fragment>
-		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
-			<!-- <Component Id="ProductComponent"> -->
-				<!-- TODO: Insert files, registry keys, and other resources here. -->
-			<!-- </Component> -->
-		</ComponentGroup>
-	</Fragment>
-</Wix>
diff --git a/References/Windows/WintunInstaller/build_installer.bat b/References/Windows/WintunInstaller/build_installer.bat
deleted file mode 100644
index ad39e1d..0000000
--- a/References/Windows/WintunInstaller/build_installer.bat
+++ /dev/null
@@ -1,48 +0,0 @@
-@echo off
-setlocal
-
-set BUILDDIR=%~dp0
-cd /d %BUILDDIR% || exit /b 1
-
-if exist .deps\prepared goto :build
-:installdeps
-	rmdir /s /q .deps 2> NUL
-	mkdir .deps || goto :error
-	cd .deps || goto :error
-	call :download wintun-x86.msm https://www.wintun.net/builds/wintun-x86-0.8.msm 7ff5fcca21be75584fea830a4624ff52305ebb6982c3ec1b294a22b20ee5c1fc || goto :error
-	call :download wintun-amd64.msm https://www.wintun.net/builds/wintun-amd64-0.8.msm 14e94f3151e425d80fc262b4bb3f351df9d3b3dde5d9cf39aad2e94c39944435 || goto :error
-	call :download wix-binaries.zip https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip 2c1888d5d1dba377fc7fa14444cf556963747ff9a0a289a3599cf09da03b9e2e || goto :error
-	echo [+] Extracting wix-binaries.zip
-	mkdir wix\bin || goto :error
-	tar -xf wix-binaries.zip -C wix\bin || goto :error
-	echo [+] Cleaning up wix-binaries.zip
-	del wix-binaries.zip || goto :error
-	copy /y NUL prepared > NUL || goto :error
-	cd .. || goto :error
-
-:build
-	set WIX=%BUILDDIR%.deps\wix\
-	call :msi x86 		|| goto :error
-	call :msi x86_64 	|| goto :error
-
-:success
-	echo [+] Success.
-	exit /b 0
-
-:download
-	echo [+] Downloading %1
-	curl -#fLo %1 %2 || exit /b 1
-	echo [+] Verifying %1
-	for /f %%a in ('CertUtil -hashfile %1 SHA256 ^| findstr /r "^[0-9a-f]*$"') do if not "%%a"=="%~3" exit /b 1
-	goto :eof
-
-:msi
-	echo [+] Compiling %1
-	"%WIX%bin\candle" WintunInstaller_%~1.wxs -o obj\ || goto error
-	echo [+] Linking %1
-	"%WIX%bin\light" obj\WintunInstaller_%~1.wixobj -o bin\WintunInstaller_%~1.msi || goto error
-	goto :eof
-
-:error
-	echo [-] Failed with error #%errorlevel%.
-	cmd /c exit %errorlevel%
diff --git a/References/Windows/scripts/build-all.bat b/References/Windows/scripts/build-all.bat
index 20f33d1..d5dbfff 100644
--- a/References/Windows/scripts/build-all.bat
+++ b/References/Windows/scripts/build-all.bat
@@ -1,4 +1,5 @@
 @ECHO OFF
+
 setlocal
 set SCRIPTDIR=%~dp0
 set APPVER=%1
@@ -7,7 +8,7 @@ set DATE=""
 
 rem ==================================================
 rem DEFINE required WireGuard version here
-set WGVER=v0.0.38
+set WGVER=v0.3.4
 rem ==================================================
 
 echo ==================================================
@@ -44,7 +45,6 @@ if %needRebuildWireGuard% == 1 call :build_wireguard || goto :error
 
 call :update_servers_info || goto :error
 call :build_agent || goto :error
-call ::build_wintun_installer || goto :error
 
 (
 	rem Save Go variables (to be able to compile CLI with the same Go version)
@@ -140,16 +140,6 @@ goto :success
 	copy /y "%SCRIPTDIR%..\.deps\wireguard-windows\amd64\wireguard.exe" "%SCRIPTDIR%..\WireGuard\x86_64\wireguard.exe" 	>nul 2>&1 || exit /b 1
 	goto :eof
 
-:build_wintun_installer
-	echo [*] Building Wintun driver installer ...
-	cd "%SCRIPTDIR%..\WintunInstaller"
-	call build_installer.bat || exit /b 1
-	echo [*] Wintun installer build DONE. Copying compiled binaries ...
-	cd "%SCRIPTDIR%..\WintunInstaller"
-	copy /y "bin\WintunInstaller_x86.msi"		"%SCRIPTDIR%..\WireGuard\x86\WintunInstaller_x86.msi" 		>nul 2>&1 || exit /b 1
-	copy /y "bin\WintunInstaller_x86_64.msi"	"%SCRIPTDIR%..\WireGuard\x86_64\WintunInstaller_x86_64.msi"	>nul 2>&1 || exit /b 1
-	goto :eof
-
 :success
 	echo [*] Success.
 	go version