diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile
index 59265d108..2a2e99770 100644
--- a/Dockerfiles/agent/windows/Dockerfile
+++ b/Dockerfiles/agent/windows/Dockerfile
@@ -7,6 +7,8 @@ FROM $BUILD_BASE_IMAGE as builder_base
 ARG PCRE_VERSION=8.45
 ARG OPENSSL_VERSION=1.1.1l
 ARG LIBMODBUS_VERSION=master
+ARG BUILD_ARCH=x64
+ARG CPU_MODEL=AMD64
 
 ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/16/release/vs_buildtools.exe
 ARG NASM_URL=https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/win64/nasm-2.15.05-installer-x64.exe
@@ -16,63 +18,73 @@ ARG PCRE_URL=https://ftp.pcre.org/pub/pcre/pcre-$PCRE_VERSION.zip
 ARG OPENSSL_URL=https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz
 ARG LIBMODBUS_URL=https://github.com/stephane/libmodbus.git
 
-ENV BUILD_ARCH=x64 CPU_MODEL=AMD64 `
+ENV BUILD_ARCH=$BUILD_ARCH CPU_MODEL=$CPU_MODEL `
     PCRE_VERSION=$PCRE_VERSION OPENSSL_VERSION=$OPENSSL_VERSION LIBMODBUS_VERSION=$LIBMODBUS_VERSION `
     GIT_URL=$GIT_URL NASM_URL=$NASM_URL PERL_URL=$PERL_URL LIBMODBUS_URL=$LIBMODBUS_URL PCRE_URL=$PCRE_URL OPENSSL_URL=$OPENSSL_URL
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 RUN Set-Location -Path $env:SystemDrive\.; `
-	`
+    `
     Write-Host ('Downloading {0} ...' -f $env:GIT_URL); `
-	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\git.zip" -Uri $env:GIT_URL; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -OutFile $env:SystemDrive\git.zip -Uri $env:GIT_URL; `
+    `
     $sha256 = '273f55e881094d00877d64f56570b0c997c4da5dedcb26738d56481033c1eba1'; `
-	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); `
-    if ((Get-FileHash "$env:SystemDrive\git.zip" -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum GIT for Windows failed!"; `
+    Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
+    if ((Get-FileHash $env:SystemDrive\git.zip -Algorithm sha256).Hash -ne $sha256) { `
+        Write-Host 'Checksum GIT for Windows failed!'; `
         exit 1; `
     }; `
-	Write-Host 'Installing ...'; `
-    Expand-Archive -Path git.zip -DestinationPath $env:SystemDrive\git\.; `
-    Remove-Item -Force -Path "$env:SystemDrive\git.zip"; `
-	$env:PATH = [string]::Format('{0}\git\cmd;{0}\git\mingw64\bin;{0}\git\usr\bin;', $env:SystemDrive) + $env:PATH; `
-	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
-	`
-	Write-Host 'Verifying install ("git version") ...'; `
-	git version; `
-	`
+    `
+    Write-Host 'Installing ...'; `
+    Expand-Archive `
+		-Path git.zip `
+		-DestinationPath $env:SystemDrive\git\.; `
+    Remove-Item -Force -Path $env:SystemDrive\git.zip; `
+    $env:PATH = [string]::Format('{0}\git\cmd;{0}\git\mingw64\bin;{0}\git\usr\bin;', $env:SystemDrive) + $env:PATH; `
+    [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
+    `
+    Write-Host 'Verifying install ("git version") ...'; `
+    git version; `
+    `
 	Write-Host ('Downloading {0} ...' -f $env:NASM_URL); `
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\nasm-installer.exe" -Uri $env:NASM_URL; `
+    Invoke-WebRequest -OutFile $env:SystemDrive\nasm_installer.exe -Uri $env:NASM_URL; `
     $sha256 = 'a02325b9fe54f917f5d6a3036637b38dbb6addf6f7ba9d344d9b943a143fe7d0'; `
-	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); `
-    if ((Get-FileHash "$env:SystemDrive\nasm-installer.exe" -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum NASM failed!"; `
+	Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
+    if ((Get-FileHash $env:SystemDrive\nasm_installer.exe -Algorithm sha256).Hash -ne $sha256) { `
+        Write-Host 'Checksum NASM failed!'; `
         exit 1; `
     }; `
 	Write-Host 'Installing ...'; `
-    Start-Process -FilePath "$env:SystemDrive\nasm-installer.exe" -argumentlist '/S' -Wait; `
-    Remove-Item -Force -Path "$env:SystemDrive\nasm-installer.exe"; `
+    Start-Process `
+		-FilePath $env:SystemDrive\nasm_installer.exe `
+		-ArgumentList '/S' -Wait; `
+    Remove-Item -Force -Path $env:SystemDrive\nasm_installer.exe; `
+	`
 	$env:PATH = [string]::Format('{0}\NASM;', ${env:ProgramFiles}) + $env:PATH; `
 	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
 	`
 	Write-Host 'Verifying install ("nasm -v") ...'; `
 	nasm -v; `
 	`
-	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
 	Write-Host ('Downloading {0} ...' -f $env:PERL_URL); `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\perl-installer.msi" -Uri $env:PERL_URL; `
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -OutFile $env:SystemDrive\perl_installer.msi -Uri $env:PERL_URL; `
 	`
     $sha256 = '241a881670164feb0b91bb69d39fbbf84c981bec0d9f8c19959f8f48fd177768'; `
-	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); `
-    if ((Get-FileHash "$env:SystemDrive\perl-installer.msi" -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum Strawberry Perl failed!"; `
+	Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
+    if ((Get-FileHash $env:SystemDrive\perl_installer.msi -Algorithm sha256).Hash -ne $sha256) { `
+        Write-Host 'Checksum Strawberry Perl failed!'; `
         exit 1; `
     }; `
 	Write-Host 'Installing ...'; `
-    Start-Process -FilePath "msiexec.exe" -argumentlist """/i C:\perl-installer.msi /qn /norestart INSTALLDIR=$env:SystemDrive\Strawberry""" -wait; `
-    Remove-Item -Force -Path  "$env:SystemDrive\perl-installer.msi"; `
+    Start-Process `
+		-FilePath 'msiexec.exe' `
+		-ArgumentList """/i $env:SystemDrive\perl_installer.msi /qn /norestart INSTALLDIR=$env:SystemDrive\Strawberry""" `
+		-Wait; `
+    Remove-Item -Force -Path  $env:SystemDrive\perl_installer.msi; `
 	$env:PATH = [string]::Format('{0}\Strawberry\perl\bin;', $env:SystemDrive) + $env:PATH; `
 	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
 	`
@@ -82,11 +94,16 @@ RUN Set-Location -Path $env:SystemDrive\.; `
 	Write-Host 'Installing Text::Template...'; `
     cpan Text::Template; `
 	`
-	Write-Host ('Downloading {0} ...' -f $env:VS_BUILDTOOLS_URL); `
-	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\vs_buildtools.exe" -Uri $env:VS_BUILDTOOLS_URL; `
-    Write-Host "Visual Studio components installing..."; `
-    cmd /C start /w "$env:SystemDrive\vs_buildtools.exe" --quiet --wait --norestart --nocache modify `
+    Write-Host ('Downloading {0} ...' -f $env:VS_BUILDTOOLS_URL); `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -OutFile $env:SystemDrive\vs_buildtools.exe $env:VS_BUILDTOOLS_URL; `
+    `
+    Write-Host ('{0} - Visual Studio components installing...' -f $(Get-Date -format 'u')); `
+    cmd /C start /w $env:SystemDrive\vs_buildtools.exe `
+        --quiet `
+        --wait `
+        --norestart `
+        --nocache modify `
         --installPath """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools""" `
         # https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2019
         --add Microsoft.VisualStudio.Component.Windows10SDK.19041 `
@@ -95,76 +112,75 @@ RUN Set-Location -Path $env:SystemDrive\.; `
         throw $err; `
     }; `
     Wait-Process -name msiexec; `
-    Write-Host "Visual Studio components installed"; `
-	`
-	Write-Host "Visual Studio components installation cleanup"; `
-    Remove-Item -Force -Path "$env:SystemDrive\vs_buildtools.exe"; `
-    Get-ChildItem -Path ('{0}\Microsoft Visual Studio\Installer' -f ${env:ProgramFiles(x86)}) -Directory -Recurse | Remove-Item -Force –Recurse; `
-    Remove-Item -Force -Recurse "$env:TEMP\*"; `
-	Write-Host 'Build environment is ready...';
+    Write-Host ('{0} - Visual Studio components installed' -f $(Get-Date -format 'u')); `
+    `
+    Write-Host 'Visual Studio components installation cleanup'; `
+    Remove-Item -Force -Path $env:SystemDrive\vs_buildtools.exe; `
+    Get-ChildItem -Path """${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer""" -Directory -Recurse | Remove-Item -Force –Recurse; `
+    Remove-Item -Force -Recurse $env:TEMP\*; `
+    Write-Host 'Build environment is ready...';
 
 RUN Set-Location -Path $env:SystemDrive\.; `
-	`
-    Import-Module """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"""; `
-    Enter-VsDevShell -VsInstallPath """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools""" -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
-	`
-	Write-Host ('Downloading {0} ...' -f $env:PCRE_URL); `
-	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\pcre-$env:PCRE_VERSION.zip" -Uri $env:PCRE_URL; `
-	`
+    `
+    Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); `
+    Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
+    `
+    Write-Host ('Downloading {0} ...' -f $env:PCRE_URL); `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -OutFile $env:SystemDrive\pcre.zip -Uri $env:PCRE_URL; `
+    `
     $sha256 = '5b709aa45ea3b8bb73052947200ad187f651a2049158fb5bbfed329e4322a977'; `
-	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); `
-    if ((Get-FileHash "$env:SystemDrive\pcre-$env:PCRE_VERSION.zip" -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum PCRE library failed!"; `
+    Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
+    if ((Get-FileHash $env:SystemDrive\pcre.zip -Algorithm sha256).Hash -ne $sha256) { `
+        Write-Host 'Checksum PCRE library failed!'; `
         exit 1; `
     }; `
-	`
-	Write-Host 'Extracting archive ...'; `
-    Expand-Archive -Path "$env:SystemDrive\pcre-$env:PCRE_VERSION.zip" -DestinationPath $env:SystemDrive ; `
-    Rename-Item -Path "$env:SystemDrive\pcre-$env:PCRE_VERSION" -NewName "$env:SystemDrive\pcre_build"; `
-    New-Item -ItemType directory -Path "$env:SystemDrive\pcre_build\build" | Out-Null; `
-	`
-    Set-Location -Path "$env:SystemDrive\pcre_build\build"; `
-	Write-Host 'Building PCRE library ...'; `
+    Write-Host 'Extracting archive ...'; `
+    Expand-Archive -Path $env:SystemDrive\pcre.zip -DestinationPath $env:SystemDrive; `
+    Remove-Item -Force -Path $env:SystemDrive\pcre.zip; `
+    Rename-Item -Path $env:SystemDrive\pcre-$env:PCRE_VERSION -NewName $env:SystemDrive\pcre_build; `
+	New-Item -ItemType directory -Path "$env:SystemDrive\pcre_build\build" | Out-Null; `
+    `
+    Set-Location -Path $env:SystemDrive\pcre_build\build; `
+    Write-Host 'Building PCRE library ...'; `
     cmake --log-level=ERROR `
-		-G """Visual Studio 16 2019""" `
+		-G 'Visual Studio 16 2019' `
 		-A $env:BUILD_ARCH `
 		-DPCRE_SUPPORT_UNICODE_PROPERTIES=ON `
 		-DPCRE_SUPPORT_UTF=ON `
-		-DCMAKE_C_FLAGS_RELEASE:string="/MT" ..; `
+		-DCMAKE_C_FLAGS_RELEASE:string="""/MT""" ..; `
     msbuild PCRE.sln `
 		-maxcpucount:"""$env:NUMBER_OF_PROCESSORS""" `
 		/verbosity:quiet `
-		/property:Configuration="Release" `
-		/property:Platform="$env:BUILD_ARCH" `
+		/property:Configuration=Release `
+		/property:Platform=$env:BUILD_ARCH `
 		/target:pcre; `
 	`
-	Write-Host 'PCRE is ready...'; `
-    Remove-Item -Force -Path "$env:SystemDrive\pcre-$env:PCRE_VERSION.zip"
+	Write-Host 'PCRE is ready...';
 
 RUN Set-Location -Path $env:SystemDrive\.; `
 	`
-    $env:PATH+=""";$env:SystemDrive\Strawberry\perl\bin;$env:SystemDrive\Program Files\NASM"""; `
-    Import-Module """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"""; `
-    Enter-VsDevShell -VsInstallPath """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools""" -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
-	`
-	Write-Host ('Downloading {0} ...' -f $env:OPENSSL_URL); `
-	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\openssl-$env:OPENSSL_VERSION.tar.gz" -Uri $env:OPENSSL_URL; `
+    Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); `
+    Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
 	`
+    Write-Host ('Downloading {0} ...' -f $env:OPENSSL_URL); `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -OutFile $env:SystemDrive\openssl.tar.gz -Uri $env:OPENSSL_URL; `
+    `
     $sha256 = '0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1'; `
-	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); `
-    if ((Get-FileHash "$env:SystemDrive\openssl-$env:OPENSSL_VERSION.tar.gz" -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum OpenSSL library failed!"; `
+    Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
+    if ((Get-FileHash $env:SystemDrive\openssl.tar.gz -Algorithm sha256).Hash -ne $sha256) { `
+        Write-Host 'Checksum OpenSSL library failed!'; `
         exit 1; `
     }; `
-	`
-	Write-Host 'Extracting archive ...'; `
-    tar -zxf $env:SystemDrive\openssl-$env:OPENSSL_VERSION.tar.gz; `
-    Rename-Item -Path "$env:SystemDrive\openssl-$env:OPENSSL_VERSION" -NewName "$env:SystemDrive\openssl_build"; `
-	`
-	Write-Host 'Building OpenSSL library...'; `
-    Set-Location -Path "$env:SystemDrive\openssl_build"; `
+    `
+    Write-Host 'Extracting archive ...'; `
+    tar -zxf $env:SystemDrive\openssl.tar.gz; `
+	Remove-Item -Force -Path $env:SystemDrive\openssl.tar.gz; `
+    Rename-Item -Path $env:SystemDrive\openssl-$env:OPENSSL_VERSION -NewName $env:SystemDrive\openssl_build; `
+    `
+    Write-Host 'Building OpenSSL library...'; `
+    Set-Location -Path $env:SystemDrive\openssl_build; `
     perl $env:SystemDrive\openssl_build\Configure `
         VC-WIN64A `
         no-shared `
@@ -173,13 +189,12 @@ RUN Set-Location -Path $env:SystemDrive\.; `
 #        enable-capieng `
         no-capieng `
         --api=1.1.0 `
-        --prefix="$env:SystemDrive\openssl_output_$env:BUILD_ARCH" `
-        --openssldir="$env:SystemDrive\openssl_output_ssl"; `
+        --prefix=$env:SystemDrive\openssl_output `
+        --openssldir=$env:SystemDrive\openssl_output_ssl; `
     set CL=/MP; `
     nmake /S; `
     nmake /S install_sw; `
-	Write-Host 'OpenSSL is ready...'; `
-    Remove-Item -Force -Path "$env:SystemDrive\openssl-$env:OPENSSL_VERSION.tar.gz"
+	Write-Host 'OpenSSL is ready...';
 
 COPY modbus.vs16.vcxproj c:\
 COPY modbus.vs16.sln c:\
@@ -187,23 +202,23 @@ COPY modbus.vs16.vcxproj.filters c:\
 
 RUN Set-Location -Path $env:SystemDrive\.; `
 	`
-    Import-Module """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"""; `
-    Enter-VsDevShell -VsInstallPath """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools""" -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
+    Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); `
+    Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
 	`
 	Write-Host ('Checkout GIT {0} repository ...' -f $env:LIBMODBUS_URL); `
-    Start-Process -FilePath "git" -Wait -ArgumentList """-c advice.detachedHead=false clone $env:LIBMODBUS_URL --branch $env:LIBMODBUS_VERSION --depth 1 --single-branch libmodbus"""; `
+    git -c advice.detachedHead=false clone $env:LIBMODBUS_URL --branch $env:LIBMODBUS_VERSION --depth 1 --single-branch $env:SystemDrive\libmodbus; `
 	`
 	Write-Host 'Building Libmodbus library...'; `
-    Copy-Item -Path "$env:SystemDrive\modbus.vs16.vcxproj" "$env:SystemDrive\libmodbus\src\win32\modbus.vs16.vcxproj"; `
-    Copy-Item -Path "$env:SystemDrive\modbus.vs16.sln" "$env:SystemDrive\libmodbus\src\win32\modbus.vs16.sln"; `
-    Copy-Item -Path "$env:SystemDrive\modbus.vs16.vcxproj.filters" "$env:SystemDrive\libmodbus\src\win32\modbus.vs16.vcxproj.filters"; `
-    Set-Location -Path "$env:SystemDrive\libmodbus\src\win32"; `
+    Copy-Item -Path $env:SystemDrive\modbus.vs16.vcxproj $env:SystemDrive\libmodbus\src\win32\modbus.vs16.vcxproj; `
+    Copy-Item -Path $env:SystemDrive\modbus.vs16.sln $env:SystemDrive\libmodbus\src\win32\modbus.vs16.sln; `
+    Copy-Item -Path $env:SystemDrive\modbus.vs16.vcxproj.filters $env:SystemDrive\libmodbus\src\win32\modbus.vs16.vcxproj.filters; `
+    Set-Location -Path $env:SystemDrive\libmodbus\src\win32; `
     cscript .\configure.js; `
     msbuild modbus.vs16.sln `
         -maxcpucount:"""$env:NUMBER_OF_PROCESSORS""" `
 		/verbosity:quiet `
-        /property:Configuration="Release" `
-        /property:Platform="$env:BUILD_ARCH"; `
+        /property:Configuration=Release `
+        /property:Platform=$env:BUILD_ARCH; `
 	Write-Host 'Libmodbus is ready...';
 
 FROM builder_base as builder_zabbix
@@ -219,44 +234,44 @@ ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSI
 
 RUN Set-Location -Path $env:SystemDrive\.; `
 	`
-    Import-Module """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"""; `
-    Enter-VsDevShell -VsInstallPath """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools""" -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
-	`
-	Write-Host ('Checkout GIT {0} (master) repository ...' -f $env:ZBX_SOURCES); `
-    Start-Process -FilePath "git" -Wait -ArgumentList """-c advice.detachedHead=false clone $env:ZBX_SOURCES --branch master --depth 1 --single-branch zabbix-$env:ZBX_VERSION"""; `
-	`
-	Write-Host ('Building Zabbix {0} version ...' -f $env:ZBX_VERSION); `
-    Set-Location -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION"; `
+    Import-Module ('{0}\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\Microsoft.VisualStudio.DevShell.dll' -f ${env:ProgramFiles(x86)} ); `
+    Enter-VsDevShell -VsInstallPath ('{0}\Microsoft Visual Studio\2019\BuildTools' -f ${env:ProgramFiles(x86)}) -DevCmdArguments """-arch=$env:BUILD_ARCH"""; `
+    `
+    Write-Host ('Checkout GIT {0} (master) repository ...' -f $env:ZBX_SOURCES); `
+    git -c advice.detachedHead=false clone $env:ZBX_SOURCES --branch master --depth 1 --single-branch $env:SystemDrive\zabbix-$env:ZBX_VERSION; `
+    `
+    Write-Host ('Building Zabbix {0} version ...' -f $env:ZBX_VERSION); `
+    Set-Location -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION; `
     $ZbxRevision=(git rev-parse --short HEAD); `
     (Get-Content include/version.h).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content include/version.h; `
-    Set-Location -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION\build\win32\project"; `
+    Set-Location -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\build\win32\project; `
     set CL=/MP; `
     nmake /S -f Makefile `
         CPU=$env:CPU_MODEL `
         CFLAGS="""/D ZABBIX_VERSION_REVISION=$ZbxRevision /D HAVE_LIBMODBUS_STATIC""" `
-        PCREINCDIR="$env:SystemDrive\pcre_build\build" `
-        PCRELIBDIR="$env:SystemDrive\pcre_build\build\Release" TLS=openssl `
+        PCREINCDIR=$env:SystemDrive\pcre_build\build `
+        PCRELIBDIR=$env:SystemDrive\pcre_build\build\Release TLS=openssl `
         RFLAGS="""/D ZABBIX_VERSION_REVISION=$ZbxRevision /D ZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM""" `
 #        LIBS="Crypt32.lib" `
-        TLSINCDIR="$env:SystemDrive\openssl_output_$env:BUILD_ARCH\include" `
-        TLSLIBDIR="$env:SystemDrive\openssl_output_$env:BUILD_ARCH\lib" `
-        MODBINCDIR="$env:SystemDrive\libmodbus\src" `
-        MODBLIBDIR="$env:SystemDrive\libmodbus\src\win32\$env:BUILD_ARCH\Release" `
-            $env:ZBX_COMPONENT; `
+        TLSINCDIR=$env:SystemDrive\openssl_output\include `
+        TLSLIBDIR=$env:SystemDrive\openssl_output\lib `
+        MODBINCDIR=$env:SystemDrive\libmodbus\src `
+        MODBLIBDIR=$env:SystemDrive\libmodbus\src\win32\$env:BUILD_ARCH\Release `
+        $env:ZBX_COMPONENT; `
 	`
-	Write-Host 'Verifying build ("zabbix_agentd.exe -V") ...'; `
+    Write-Host 'Verifying build ("zabbix_agent2.exe -V") ...'; `
     & $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe -V; `
     dumpbin /dependents $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe; `
 	`
-    New-Item -ItemType directory -Path "$env:SystemDrive\zabbix" | Out-Null; `
-    New-Item -ItemType directory -Path "$env:SystemDrive\zabbix\sbin" | Out-Null; `
-    New-Item -ItemType directory -Path "$env:SystemDrive\zabbix\conf" | Out-Null; `
+    New-Item -ItemType directory -Path $env:SystemDrive\zabbix | Out-Null; `
+    New-Item -ItemType directory -Path $env:SystemDrive\zabbix\sbin | Out-Null; `
+    New-Item -ItemType directory -Path $env:SystemDrive\zabbix\conf | Out-Null; `
 	`
-    Copy-Item -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe" "$env:SystemDrive\zabbix\sbin"; `
-    Copy-Item -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_get.exe" "$env:SystemDrive\zabbix\sbin"; `
-    Copy-Item -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_sender.exe" "$env:SystemDrive\zabbix\sbin"; `
-    Copy-Item -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION\conf\zabbix_agentd.win.conf" "$env:SystemDrive\zabbix\conf"; `
-	Write-Host 'Zabbix is ready...';
+    Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe $env:SystemDrive\zabbix\sbin; `
+    Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_get.exe $env:SystemDrive\zabbix\sbin; `
+    Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_sender.exe $env:SystemDrive\zabbix\sbin; `
+    Copy-Item -Path $env:SystemDrive\zabbix-$env:ZBX_VERSION\conf\zabbix_agentd.win.conf $env:SystemDrive\zabbix\conf; `
+    Write-Host 'Zabbix binaries are compiled...';
 
 FROM $BASE_IMAGE
 
@@ -283,21 +298,27 @@ COPY [".\\docker-entrypoint.ps1", "C:\\zabbix"]
 
 USER ContainerAdministrator
 
-RUN setx /M PATH """$env:PATH;$env:SystemDrive\zabbix\sbin;$env:SystemDrive\zabbix\bin;"""; `
-    setx /M ZBXDIR """$env:SystemDrive\zabbix"""
+RUN $env:PATH = [string]::Format('{0}\zabbix\sbin;{0}\zabbix\bin;', $env:SystemDrive) + $env:PATH; `
+    [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
+    `
+    $env:ZBX_HOME = [string]::Format('{0}\zabbix', $env:SystemDrive); `
+    [Environment]::SetEnvironmentVariable('ZBX_HOME', $env:ZBX_HOME, [EnvironmentVariableTarget]::Machine);
 
-RUN Set-Location -Path "$env:SystemDrive"\; `
-    New-Item -ItemType directory -Path "$env:ZBXDIR\conf\zabbix_agentd.d" | Out-Null; `
-    New-Item -ItemType directory -Path "$env:ZBXDIR\enc" | Out-Null; `
-    New-Item -ItemType directory -Path "$env:ZBXDIR\modules" | Out-Null; `
+RUN Set-Location -Path $env:SystemDrive\.; `
+    `
+    New-Item -ItemType directory -Path $env:ZBX_HOME\conf\zabbix_agentd.d | Out-Null; `
+    New-Item -ItemType directory -Path $env:ZBX_HOME\enc | Out-Null; `
+    New-Item -ItemType directory -Path $env:ZBX_HOME\modules | Out-Null; `
+    New-Item -ItemType directory -Path $env:ZBX_HOME\buffer | Out-Null; `
+    `
     net user /add zabbix; `
-    $acl = Get-Acl -Path $env:ZBXDIR; `
-    $ace = New-Object Security.AccessControl.FileSystemAccessRule('zabbix', 'Modify', 'ContainerInherit, ObjectInherit', 'InheritOnly', 'Allow'); `
+    $acl = Get-Acl -Path $env:ZBX_HOME; `
+    $ace = New-Object Security.AccessControl.FileSystemAccessRule ('zabbix', 'Modify', 'ContainerInherit, ObjectInherit', 'InheritOnly', 'Allow'); `
     $acl.AddAccessRule($ace); `
-    Set-Acl -AclObject $acl -Path $env:ZBXDIR
+    Set-Acl -AclObject $acl -Path $env:ZBX_HOME;
 
 USER zabbix
 
 EXPOSE 10050/TCP
 
-CMD $env:SystemDrive\zabbix\docker-entrypoint.ps1 $env:SystemDrive\zabbix\sbin\zabbix_agentd.exe -c $env:SystemDrive\zabbix\conf\zabbix_agentd.win.conf -f
+CMD C:\zabbix\docker-entrypoint.ps1 C:\zabbix\sbin\zabbix_agentd.exe -c C:\zabbix\conf\zabbix_agentd.win.conf -f
diff --git a/Dockerfiles/agent2/windows/Dockerfile b/Dockerfiles/agent2/windows/Dockerfile
index 0a22a5365..7e06009a5 100644
--- a/Dockerfiles/agent2/windows/Dockerfile
+++ b/Dockerfiles/agent2/windows/Dockerfile
@@ -33,12 +33,13 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 RUN Set-Location -Path $env:SystemDrive\.; `
     `
     Write-Host ('Downloading {0} ...' -f $env:GIT_URL); `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
     Invoke-WebRequest -OutFile $env:SystemDrive\git.zip -Uri $env:GIT_URL; `
     `
     $sha256 = '273f55e881094d00877d64f56570b0c997c4da5dedcb26738d56481033c1eba1'; `
     Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
-    if ((Get-FileHash "$env:SystemDrive\git.zip" -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum GIT for Windows failed!"; `
+    if ((Get-FileHash $env:SystemDrive\git.zip -Algorithm sha256).Hash -ne $sha256) { `
+        Write-Host 'Checksum GIT for Windows failed!'; `
         exit 1; `
     }; `
     `
@@ -52,17 +53,21 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     git version; `
     `
     Write-Host ('Downloading {0} ...' -f $env:GOLANG_URL); `
-    Invoke-WebRequest -OutFile $env:SystemDrive\go$env:GOLANG_VERSION.windows-amd64.msi -Uri $env:GOLANG_URL; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -OutFile $env:SystemDrive\go-amd64.msi -Uri $env:GOLANG_URL; `
     $sha256 = '7a360967708350354ea479500a8eada6a032e07eac5bd43142367ee5b0ab1df9'; `
     `
     Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
-    if ((Get-FileHash "$env:SystemDrive\go$env:GOLANG_VERSION.windows-amd64.msi" -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum Go Lang failed!"; `
+    if ((Get-FileHash $env:SystemDrive\go-amd64.msi -Algorithm sha256).Hash -ne $sha256) { `
+        Write-Host 'Checksum Go Lang failed!'; `
         exit 1; `
     }; `
     Write-Host 'Installing ...'; `
-    Start-Process -FilePath $env:SystemDrive\go$env:GOLANG_VERSION.windows-amd64.msi -Wait -ArgumentList '/qn /norestart'; `
-    Remove-Item -Force -Path $env:SystemDrive\go$env:GOLANG_VERSION.windows-amd64.msi; `
+    Start-Process `
+		-FilePath $env:SystemDrive\go-amd64.msi `
+		-Wait `
+		-ArgumentList '/qn /norestart'; `
+    Remove-Item -Force -Path $env:SystemDrive\go-amd64.msi; `
     `
     $env:PATH = [string]::Format('{0}\Go\bin;', ${env:ProgramFiles}) + $env:PATH; `
     [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
@@ -70,17 +75,21 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     go version; `
     `
     Write-Host ('Downloading {0} ...' -f $env:SEVEN_ZIP_URL); `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
     Invoke-WebRequest -OutFile $env:SystemDrive\7z.msi -Uri $env:SEVEN_ZIP_URL; `
     `
     $sha256 = 'a7803233eedb6a4b59b3024ccf9292a6fffb94507dc998aa67c5b745d197a5dc'; `
     Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
     if ((Get-FileHash $env:SystemDrive\7z.msi -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum 7-zip failed!"; `
+        Write-Host 'Checksum 7-zip failed!'; `
         exit 1; `
     }; `
     `
     Write-Host 'Installing ...'; `
-    Start-Process -FilePath $env:SystemDrive\7z.msi -Wait -ArgumentList '/qn /norestart'; `
+    Start-Process `
+		-FilePath $env:SystemDrive\7z.msi `
+		-Wait `
+		-ArgumentList '/qn /norestart'; `
     Remove-Item -Force -Path $env:SystemDrive\7z.msi; `
     $env:PATH = [string]::Format('{0}\7-Zip;', ${env:ProgramFiles}) + $env:PATH; `
     [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
@@ -89,12 +98,13 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     7z -h | Select -first 2; `
     `
     Write-Host ('Downloading {0} ...' -f $env:MINGW_URL); `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
     Invoke-WebRequest -OutFile $env:SystemDrive\mingw.7z -Uri $env:MINGW_URL; `
     `
     $sha256 = 'e8c65ddc655534b0330f66f7b480565621e8617cda9937d76ba141a22bf3b2fa'; `
     Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
     if ((Get-FileHash $env:SystemDrive\mingw.7z -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum Mingw-w64 failed!"; `
+        Write-Host 'Checksum Mingw-w64 failed!'; `
         exit 1; `
     }; `
     `
@@ -108,7 +118,8 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     mingw32-make -v; `
     `
     Write-Host ('Downloading {0} ...' -f $env:VS_BUILDTOOLS_URL); `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\vs_buildtools.exe" $env:VS_BUILDTOOLS_URL; `
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
+    Invoke-WebRequest -OutFile $env:SystemDrive\vs_buildtools.exe $env:VS_BUILDTOOLS_URL; `
     `
     Write-Host ('{0} - Visual Studio components installing...' -f $(Get-Date -format 'u')); `
     cmd /C start /w $env:SystemDrive\vs_buildtools.exe `
@@ -144,7 +155,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
     $sha256 = '5b709aa45ea3b8bb73052947200ad187f651a2049158fb5bbfed329e4322a977'; `
     if ((Get-FileHash $env:SystemDrive\pcre.zip -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum PCRE library failed!"; `
+        Write-Host 'Checksum PCRE library failed!'; `
         exit 1; `
     }; `
     Write-Host 'Extracting archive ...'; `
@@ -174,7 +185,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     $sha256 = 'b9219acd1241ffa4d38e19587f1ccc2854f951e451f3858efc9d2e1fe19d375c'; `
     Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
     if ((Get-FileHash $env:SystemDrive\setup.exe -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum Cygwin failed!"; `
+        Write-Host 'Checksum Cygwin failed!'; `
         exit 1; `
     }; `
     Write-Host 'Installing ...'; `
@@ -186,17 +197,18 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     Remove-Item -Force -Path $env:SystemDrive\setup.exe; `
     Write-Host ('Downloading {0} ...' -f $env:OPENSSL_URL); `
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\openssl.tar.gz" -Uri $env:OPENSSL_URL; `
+    Invoke-WebRequest -OutFile $env:SystemDrive\openssl.tar.gz -Uri $env:OPENSSL_URL; `
     `
     $sha256 = '0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1'; `
     Write-Host ('Verifying SHA256 ({0}) ...' -f $sha256); `
-    if ((Get-FileHash "$env:SystemDrive\openssl.tar.gz" -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum OpenSSL library failed!"; `
+    if ((Get-FileHash $env:SystemDrive\openssl.tar.gz -Algorithm sha256).Hash -ne $sha256) { `
+        Write-Host 'Checksum OpenSSL library failed!'; `
         exit 1; `
     }; `
     `
     Write-Host 'Extracting archive ...'; `
     tar -zxf $env:SystemDrive\openssl.tar.gz; `
+	Remove-Item -Force -Path $env:SystemDrive\openssl.tar.gz; `
     Rename-Item -Path $env:SystemDrive\openssl-$env:OPENSSL_VERSION -NewName $env:SystemDrive\openssl_build; `
     `
     Write-Host 'Building OpenSSL library...'; `
@@ -292,10 +304,10 @@ RUN $env:PATH = [string]::Format('{0}\zabbix\sbin;{0}\zabbix\bin;', $env:SystemD
 
 RUN Set-Location -Path $env:SystemDrive\.; `
     `
-    New-Item -ItemType directory -Path "$env:ZBX_HOME\conf\zabbix_agentd.d" | Out-Null; `
-    New-Item -ItemType directory -Path "$env:ZBX_HOME\enc" | Out-Null; `
-    New-Item -ItemType directory -Path "$env:ZBX_HOME\modules" | Out-Null; `
-    New-Item -ItemType directory -Path "$env:ZBX_HOME\buffer" | Out-Null; `
+    New-Item -ItemType directory -Path $env:ZBX_HOME\conf\zabbix_agentd.d | Out-Null; `
+    New-Item -ItemType directory -Path $env:ZBX_HOME\enc | Out-Null; `
+    New-Item -ItemType directory -Path $env:ZBX_HOME\modules | Out-Null; `
+    New-Item -ItemType directory -Path $env:ZBX_HOME\buffer | Out-Null; `
     `
     net user /add zabbix; `
     $acl = Get-Acl -Path $env:ZBX_HOME; `