diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile
index f80d71e56..59265d108 100644
--- a/Dockerfiles/agent/windows/Dockerfile
+++ b/Dockerfiles/agent/windows/Dockerfile
@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1
 # escape=`
 ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022
 ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022
@@ -10,53 +11,80 @@ ARG LIBMODBUS_VERSION=master
 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
 ARG PERL_URL=https://strawberryperl.com/download/5.32.1.1/strawberry-perl-5.32.1.1-64bit.msi
-ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.2/Git-2.33.0.2-64-bit.exe
+ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.2/MinGit-2.33.0.2-busybox-64-bit.zip
+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
 
-ARG VS_DEV_CMD_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat"
-ARG VC_VARS_ALL_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat"
-
 ENV BUILD_ARCH=x64 CPU_MODEL=AMD64 `
     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 `
-    VS_DEV_CMD_LOCATION=$VS_DEV_CMD_LOCATION VC_VARS_ALL_LOCATION=$VC_VARS_ALL_LOCATION
+    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-Verbose -Message 'Visual Studio components installing...'; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\git-installer.exe" $env:GIT_URL; `
-    $sha256 = 'a5704733c219e9a0c96bfeb0febef62bc2518bdd4e358bc9519dbc5e63a3b5fe'; `
-    if ((Get-FileHash "$env:SystemDrive\git-installer.exe" -Algorithm sha256).Hash -ne $sha256) { `
+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!"; `
         exit 1; `
     }; `
-    Start-Process -FilePath "$env:SystemDrive\git-installer.exe" -argumentlist '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /NOCANCEL /SP- /LOG /COMPONENTS="icons,assoc,assoc_sh,ext,ext\shellhere,gitlfs' -wait; `
-    Remove-Item -Force -Path "$env:SystemDrive\git-installer.exe"; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\nasm-installer.exe" $env:NASM_URL; `
+	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; `
     $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!"; `
         exit 1; `
     }; `
-    Start-Process -FilePath "$env:SystemDrive\nasm-installer.exe" -argumentlist '/S'; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\perl-installer.msi" $env:PERL_URL; `
+	Write-Host 'Installing ...'; `
+    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; `
+	`
     $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!"; `
         exit 1; `
     }; `
+	Write-Host 'Installing ...'; `
     Start-Process -FilePath "msiexec.exe" -argumentlist """/i C:\perl-installer.msi /qn /norestart INSTALLDIR=$env:SystemDrive\Strawberry""" -wait; `
-    $env:PATH+=""";$env:SystemDrive\Strawberry\perl\bin"""; `
-    cpan Text::Template; `
-    Remove-Item -Force -Path "$env:SystemDrive\nasm-installer.exe"; `
     Remove-Item -Force -Path  "$env:SystemDrive\perl-installer.msi"; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\vs_buildtools.exe" $env:VS_BUILDTOOLS_URL; `
-    $sha256 = 'f3a7e2868c203490a4095231e20e628bf661b7469f2d53626f3fbbdfc161d471'; `
-    if ((Get-FileHash "$env:SystemDrive\vs_buildtools.exe" -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum Visual Studio Build tools failed!"; `
-        exit 1; `
-    }; `
+	$env:PATH = [string]::Format('{0}\Strawberry\perl\bin;', $env:SystemDrive) + $env:PATH; `
+	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
+	`
+	Write-Host 'Verifying install ("perl -V") ...'; `
+	perl -V; `
+	`
+	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 `
         --installPath """${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\BuildTools""" `
@@ -68,43 +96,74 @@ RUN Set-Location -Path "$env:SystemDrive"\; `
     }; `
     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 """${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer""" -Directory -Recurse | Remove-Item -Force –Recurse; `
-    Remove-Item -Force -Recurse "$env:TEMP\*";
+    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...';
 
-RUN Set-Location -Path "$env:SystemDrive"\; `
+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"""; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\pcre-$env:PCRE_VERSION.zip" https://ftp.pcre.org/pub/pcre/pcre-$env:PCRE_VERSION.zip; `
+	`
+	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; `
+	`
     $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!"; `
         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"; `
-    cmake -G """Visual Studio 16 2019""" -A $env:BUILD_ARCH -DPCRE_SUPPORT_UNICODE_PROPERTIES=ON -DPCRE_SUPPORT_UTF=ON -DCMAKE_C_FLAGS_RELEASE:string="/MT" ..; `
+	Write-Host 'Building PCRE library ...'; `
+    cmake --log-level=ERROR `
+		-G """Visual Studio 16 2019""" `
+		-A $env:BUILD_ARCH `
+		-DPCRE_SUPPORT_UNICODE_PROPERTIES=ON `
+		-DPCRE_SUPPORT_UTF=ON `
+		-DCMAKE_C_FLAGS_RELEASE:string="/MT" ..; `
     msbuild PCRE.sln `
 		-maxcpucount:"""$env:NUMBER_OF_PROCESSORS""" `
+		/verbosity:quiet `
 		/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"
 
-RUN Set-Location -Path "$env:SystemDrive"\; `
+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"""; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\openssl-$env:OPENSSL_VERSION.tar.gz" https://www.openssl.org/source/openssl-$env:OPENSSL_VERSION.tar.gz; `
+	`
+	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; `
+	`
     $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!"; `
         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"; `
     perl $env:SystemDrive\openssl_build\Configure `
         VC-WIN64A `
@@ -117,18 +176,24 @@ RUN Set-Location -Path "$env:SystemDrive"\; `
         --prefix="$env:SystemDrive\openssl_output_$env:BUILD_ARCH" `
         --openssldir="$env:SystemDrive\openssl_output_ssl"; `
     set CL=/MP; `
-    nmake; `
-    nmake install_sw; `
+    nmake /S; `
+    nmake /S install_sw; `
+	Write-Host 'OpenSSL is ready...'; `
     Remove-Item -Force -Path "$env:SystemDrive\openssl-$env:OPENSSL_VERSION.tar.gz"
 
 COPY modbus.vs16.vcxproj c:\
 COPY modbus.vs16.sln c:\
 COPY modbus.vs16.vcxproj.filters c:\
 
-RUN Set-Location -Path "$env:SystemDrive"; `
+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"""; `
-    Start-Process -FilePath "${env:ProgramFiles}\Git\bin\git.exe" -Wait -ArgumentList """-c advice.detachedHead=false clone $env:LIBMODBUS_URL --branch $env:LIBMODBUS_VERSION --depth 1 --single-branch libmodbus"""; `
+	`
+	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"""; `
+	`
+	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"; `
@@ -136,8 +201,10 @@ RUN Set-Location -Path "$env:SystemDrive"; `
     cscript .\configure.js; `
     msbuild modbus.vs16.sln `
         -maxcpucount:"""$env:NUMBER_OF_PROCESSORS""" `
+		/verbosity:quiet `
         /property:Configuration="Release" `
-        /property:Platform="$env:BUILD_ARCH"
+        /property:Platform="$env:BUILD_ARCH"; `
+	Write-Host 'Libmodbus is ready...';
 
 FROM builder_base as builder_zabbix
 
@@ -150,17 +217,21 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ARG ZBX_COMPONENT=all
 ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION ZABBIX_VERSION_RC_NUM=$ZABBIX_VERSION_RC_NUM
 
-RUN Set-Location -Path "$env:SystemDrive"\; `
+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"""; `
-    Start-Process -FilePath "${env:ProgramFiles}\Git\bin\git.exe" -Wait -ArgumentList """-c advice.detachedHead=false clone $env:ZBX_SOURCES --branch master --depth 1 --single-branch zabbix-$env:ZBX_VERSION"""; `
-    Write-Host "Building Zabbix $env:ZBX_VERSION version"; `
+	`
+	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"; `
     $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 CL=/MP; `
-    nmake -f Makefile `
+    nmake /S -f Makefile `
         CPU=$env:CPU_MODEL `
         CFLAGS="""/D ZABBIX_VERSION_REVISION=$ZbxRevision /D HAVE_LIBMODBUS_STATIC""" `
         PCREINCDIR="$env:SystemDrive\pcre_build\build" `
@@ -172,15 +243,20 @@ RUN Set-Location -Path "$env:SystemDrive"\; `
         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") ...'; `
+    & $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; `
-    & $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; `
+	`
     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"
+    Copy-Item -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION\conf\zabbix_agentd.win.conf" "$env:SystemDrive\zabbix\conf"; `
+	Write-Host 'Zabbix is ready...';
 
 FROM $BASE_IMAGE
 
@@ -208,20 +284,20 @@ 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"""
+    setx /M ZBXDIR """$env:SystemDrive\zabbix"""
 
 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; `
+    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; `
     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:ZBXDIR; `
+    $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:ZBXDIR
 
 USER zabbix
 
 EXPOSE 10050/TCP
 
-CMD C:\zabbix\docker-entrypoint.ps1 C:\zabbix\sbin\zabbix_agentd.exe -c C:\zabbix\conf\zabbix_agentd.win.conf -f
+CMD $env:SystemDrive\zabbix\docker-entrypoint.ps1 $env:SystemDrive\zabbix\sbin\zabbix_agentd.exe -c $env:SystemDrive\zabbix\conf\zabbix_agentd.win.conf -f
diff --git a/Dockerfiles/agent2/windows/Dockerfile b/Dockerfiles/agent2/windows/Dockerfile
index 329638447..95447fed5 100644
--- a/Dockerfiles/agent2/windows/Dockerfile
+++ b/Dockerfiles/agent2/windows/Dockerfile
@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1
 # escape=`
 ARG BUILD_BASE_IMAGE=mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2022
 ARG BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022
@@ -6,65 +7,101 @@ FROM $BUILD_BASE_IMAGE as builder_base
 ARG PCRE_VERSION=8.45
 ARG OPENSSL_VERSION=1.1.1l
 ARG ZLIB_VERSION=1.2.11
-ARG GOLANG_VERSION=1.17
+ARG GOLANG_VERSION=1.17.1
 ARG SEVEN_ZIP_VERSION=1900
+ARG BUILD_ARCH=x64
+ARG CPU_MODEL=AMD64
 
 ARG VS_BUILDTOOLS_URL=https://aka.ms/vs/16/release/vs_buildtools.exe
 
-ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.2/Git-2.33.0.2-64-bit.exe
+ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.2/MinGit-2.33.0.2-busybox-64-bit.zip
 ARG MINGW_URL=https://deac-riga.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-win32/sjlj/x86_64-8.1.0-release-win32-sjlj-rt_v6-rev0.7z
+ARG GOLANG_URL=https://golang.org/dl/go$GOLANG_VERSION.windows-amd64.msi
 ARG CYGWIN_URL=https://cygwin.com/setup-x86_64.exe
+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 SEVEN_ZIP_URL=https://www.7-zip.org/a/7z$SEVEN_ZIP_VERSION-$BUILD_ARCH.msi
 
-ARG VS_DEV_CMD_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat"
-
-ENV BUILD_ARCH=x64 CPU_MODEL=AMD64 `
+ENV BUILD_ARCH=$BUILD_ARCH CPU_MODEL=$CPU_MODEL `
     PCRE_VERSION=$PCRE_VERSION OPENSSL_VERSION=$OPENSSL_VERSION ZLIB_VERSION=$ZLIB_VERSION `
     GOLANG_VERSION=$GOLANG_VERSION SEVEN_ZIP_VERSION=$SEVEN_ZIP_VERSION `
-    GIT_URL=$GIT_URL MINGW_URL=$MINGW_URL CYGWIN_URL=$CYGWIN_URL `
-    VS_DEV_CMD_LOCATION=$VS_DEV_CMD_LOCATION
+    GIT_URL=$GIT_URL MINGW_URL=$MINGW_URL CYGWIN_URL=$CYGWIN_URL GOLANG_URL=$GOLANG_URL SEVEN_ZIP_URL=$SEVEN_ZIP_URL `
+	PCRE_URL=$PCRE_URL OPENSSL_URL=$OPENSSL_URL
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-RUN Set-Location -Path "$env:SystemDrive"\; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\git-installer.exe" $env:GIT_URL; `
-    $sha256 = 'a5704733c219e9a0c96bfeb0febef62bc2518bdd4e358bc9519dbc5e63a3b5fe'; `
-    if ((Get-FileHash "$env:SystemDrive\git-installer.exe" -Algorithm sha256).Hash -ne $sha256) { `
+RUN Set-Location -Path $env:SystemDrive\.; `
+	`
+    Write-Host ('Downloading {0} ...' -f $env:GIT_URL); `
+    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!"; `
         exit 1; `
     }; `
-    Start-Process -FilePath "$env:SystemDrive\git-installer.exe" -ArgumentList '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /NOCANCEL /SP- /LOG /COMPONENTS="icons,assoc,assoc_sh,ext,ext\shellhere,gitlfs' -wait; `
-    Remove-Item -Force -Path "$env:SystemDrive\git-installer.exe"; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\go$env:GOLANG_VERSION.windows-amd64.msi" https://golang.org/dl/go$env:GOLANG_VERSION.windows-amd64.msi; `
-    $sha256 = '705254e0a459edae2c6bf4c88be0b4a14ac1cbbf9607a379112235f0271e6c4b'; `
+	`
+	Write-Host 'Installing ...'; `
+    Expand-Archive -Path git.zip -DestinationPath $env:SystemDrive\git\.; `
+    Remove-Item -Force -Path "$env:SystemDrive\git.zip"; `
+	$env:PATH = """$env:SystemDrive\git\cmd;$env:SystemDrive\git\mingw64\bin;$env:SystemDrive\git\usr\bin;""" + $env:PATH; `
+	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
+	`
+	Write-Host 'Verifying install ("git version") ...'; `
+	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; `
+    $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!"; `
         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"; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\7z$env:SEVEN_ZIP_VERSION-$env:BUILD_ARCH.msi" https://www.7-zip.org/a/7z$env:SEVEN_ZIP_VERSION-$env:BUILD_ARCH.msi; `
+	`
+	$env:PATH = [string]::Format('{0}\Go\bin;', ${env:ProgramFiles}) + $env:PATH; `
+	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
+	Write-Host 'Verifying install ("go version") ...'; `
+	go version; `
+	`
+    Write-Host ('Downloading {0} ...' -f $env:SEVEN_ZIP_URL); `
+    Invoke-WebRequest -OutFile "$env:SystemDrive\7z$env:SEVEN_ZIP_VERSION-$env:BUILD_ARCH.msi" -Uri $env:SEVEN_ZIP_URL; `
 	$sha256 = 'a7803233eedb6a4b59b3024ccf9292a6fffb94507dc998aa67c5b745d197a5dc'; `
+	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); `
     if ((Get-FileHash "$env:SystemDrive\7z$env:SEVEN_ZIP_VERSION-$env:BUILD_ARCH.msi" -Algorithm sha256).Hash -ne $sha256) { `
         Write-Host "Checksum 7-zip failed!"; `
         exit 1; `
     }; `
+	`
+	Write-Host 'Installing ...'; `
     Start-Process -FilePath "$env:SystemDrive\7z$env:SEVEN_ZIP_VERSION-$env:BUILD_ARCH.msi" -Wait -ArgumentList '/qn /norestart'; `
     Remove-Item -Force -Path "$env:SystemDrive\7z$env:SEVEN_ZIP_VERSION-$env:BUILD_ARCH.msi"; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\mingw.7z" $env:MINGW_URL; `
+	$env:PATH = [string]::Format('{0}\7-Zip;', ${env:ProgramFiles}) + $env:PATH; `
+	[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine); `
+	`
+	Write-Host 'Verifying install ("7z -h") ...'; `
+	7z -h | Select -first 2; `
+	`
+    Write-Host ('Downloading {0} ...' -f $env:MINGW_URL); `
+    Invoke-WebRequest -OutFile "$env:SystemDrive\mingw.7z" -Uri $env:MINGW_URL; `
 	$sha256 = 'e8c65ddc655534b0330f66f7b480565621e8617cda9937d76ba141a22bf3b2fa'; `
     if ((Get-FileHash "$env:SystemDrive\mingw.7z" -Algorithm sha256).Hash -ne $sha256) { `
         Write-Host "Checksum Mingw-w64 failed!"; `
         exit 1; `
     }; `
-    Start-Process -FilePath "${env:ProgramFiles}\7-Zip\7z.exe" -Wait -ArgumentList """x $env:SystemDrive\mingw.7z"""; `
+	`
+	Write-Host 'Installing ...'; `
+    Start-Process -FilePath "7z" -Wait -ArgumentList """x $env:SystemDrive\mingw.7z"""; `
     Remove-Item -Force -Path "$env:SystemDrive\mingw.7z"; `
+	`
+	Write-Host ('Downloading {0} ...' -f $env:VS_BUILDTOOLS_URL); `
 	Invoke-WebRequest -OutFile "$env:SystemDrive\vs_buildtools.exe" $env:VS_BUILDTOOLS_URL; `
-	$sha256 = 'f3a7e2868c203490a4095231e20e628bf661b7469f2d53626f3fbbdfc161d471'; `
-    if ((Get-FileHash "$env:SystemDrive\vs_buildtools.exe" -Algorithm sha256).Hash -ne $sha256) { `
-        Write-Host "Checksum Visual Studio Build tools failed!"; `
-        exit 1; `
-    }; `
-    Write-Host "Visual Studio components installing..."; `
+    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
@@ -74,24 +111,36 @@ RUN Set-Location -Path "$env:SystemDrive"\; `
         throw $err; `
     }; `
     Wait-Process -name msiexec; `
-    Write-Host "Visual Studio components installed"; `
+    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\*";
+    Remove-Item -Force -Recurse "$env:TEMP\*"; `
+	Write-Host 'Build environment is ready...';
 
-RUN Set-Location -Path "$env:SystemDrive"\; `
+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"""; `
     $env:PATH+=""";$env:SystemDrive\mingw64\bin"""; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\pcre-$env:PCRE_VERSION.zip" https://ftp.pcre.org/pub/pcre/pcre-$env:PCRE_VERSION.zip; `
+	`
+	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; `
+	`
+	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); `
     $sha256 = '5b709aa45ea3b8bb73052947200ad187f651a2049158fb5bbfed329e4322a977'; `
     if ((Get-FileHash "$env:SystemDrive\pcre-$env:PCRE_VERSION.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_mingw"; `
+	`
     Set-Location -Path "$env:SystemDrive\pcre_build_mingw"; `
+	Write-Host 'Building PCRE library ...'; `
     cmake `
         -G """MinGW Makefiles""" `
         -DBUILD_SHARED_LIBS=OFF `
@@ -99,26 +148,40 @@ RUN Set-Location -Path "$env:SystemDrive"\; `
         -DCMAKE_C_FLAGS="""-O2 -g""" `
         -DCMAKE_CXX_FLAGS="""-O2 -g""" `
         -DCMAKE_INSTALL_PREFIX="""$env:SystemDrive\pcre_output_mingw""" . ; `
-    mingw32-make -j"""$env:NUMBER_OF_PROCESSORS"""; `
-    mingw32-make -j"""$env:NUMBER_OF_PROCESSORS""" install; `
+    mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS"""; `
+    mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install; `
+	Write-Host 'PCRE is ready...'; `
     Remove-Item -Force -Path "$env:SystemDrive\pcre-$env:PCRE_VERSION.zip"
 
-RUN Set-Location -Path "$env:SystemDrive"\; `
+RUN Set-Location -Path $env:SystemDrive\; `
+	`
+	Write-Host ('Downloading {0} ...' -f $env:CYGWIN_URL); `
     (New-Object Net.WebClient).DownloadFile("""$env:CYGWIN_URL""", """$env:SystemDrive\setup-x86_64.exe"""); `
     $sha256 = 'b9219acd1241ffa4d38e19587f1ccc2854f951e451f3858efc9d2e1fe19d375c'; `
+	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); `
     if ((Get-FileHash "$env:SystemDrive\setup-x86_64.exe" -Algorithm sha256).Hash -ne $sha256) { `
         Write-Host "Checksum Cygwin failed!"; `
         exit 1; `
     }; `
+	Write-Host 'Installing ...'; `
     Start-Process "$env:SystemDrive\setup-x86_64.exe" -ArgumentList """-qnNdO -a x86_64 -R $env:SystemDrive\cygwin --site http://cygwin.mirror.constant.com -l $env:SystemDrive\cygwin\var\cache\setup --packages perl""" -Wait -NoNewWindow; `
-    Invoke-WebRequest -OutFile "$env:SystemDrive\openssl-$env:OPENSSL_VERSION.tar.gz" https://www.openssl.org/source/openssl-$env:OPENSSL_VERSION.tar.gz; `
+	`
+	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; `
+	`
     $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!"; `
         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_mingw"; `
+	`
+	Write-Host 'Building OpenSSL library...'; `
     Set-Location -Path "$env:SystemDrive\openssl_build_mingw"; `
     $env:PATH+=""";$env:SystemDrive\mingw64\bin;$env:SystemDrive\cygwin\bin"""; `
     perl Configure `
@@ -131,8 +194,9 @@ RUN Set-Location -Path "$env:SystemDrive"\; `
         --api=1.1.0 `
         --prefix="$env:SystemDrive\openssl_output" `
         --openssldir="$env:SystemDrive\openssl_output_ssl"; `
-    mingw32-make -j"""$env:NUMBER_OF_PROCESSORS"""; `
-    mingw32-make -j"""$env:NUMBER_OF_PROCESSORS""" install_sw; `
+    mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS"""; `
+    mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" install_sw; `
+	Write-Host 'OpenSSL is ready...'; `
     Remove-Item -Recurse -Force -Path "$env:SystemDrive\cygwin"; `
     Remove-Item -Force -Path "$env:SystemDrive\setup-x86_64.exe"
 
@@ -147,28 +211,37 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
 ARG ZBX_COMPONENT=all
 ENV ZBX_SOURCES=$ZBX_SOURCES MAJOR_VERSION=$MAJOR_VERSION ZBX_VERSION=$ZBX_VERSION
 
-RUN Set-Location -Path "$env:SystemDrive"\; `
+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"""; `
-    Start-Process -FilePath "${env:ProgramFiles}\Git\bin\git.exe" -Wait -ArgumentList """-c advice.detachedHead=false clone $env:ZBX_SOURCES --branch master --depth 1 --single-branch zabbix-$env:ZBX_VERSION"""; `
-    Write-Host "Building Zabbix $env:ZBX_VERSION version"; `
+		`
+	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"; `
     $ZbxRevision=(git rev-parse --short HEAD); `
     (Get-Content src\go\pkg\version\version.go).replace('{ZABBIX_REVISION}', $ZbxRevision) | Set-Content src\go\pkg\version\version.go; `
     $env:PATH+=""";$env:SystemDrive\mingw64\bin"""; `
     Set-Location -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION\build\mingw"; `
-    mingw32-make -j"""$env:NUMBER_OF_PROCESSORS""" `
+    mingw32-make -s -j"""$env:NUMBER_OF_PROCESSORS""" `
 #        CGO_LDFLAGS="""-lssl -lcrypto -lcrypt32 -L$env:SystemDrive\openssl_output\lib -L$env:SystemDrive\pcre_output\lib""" `
         PCRE="$env:SystemDrive\pcre_output_mingw" `
         OPENSSL="$env:SystemDrive\openssl_output" `
         RFLAGS="""-DZABBIX_VERSION_RC_NUM=$env:ZABBIX_VERSION_RC_NUM"""; `
+	`
+	Write-Host 'Verifying build ("zabbix_agent2.exe -V") ...'; `
+    & $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agent2.exe -V; `
+    dumpbin /dependents $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agent2.exe; `
+	`
     New-Item -ItemType directory -Path "$env:SystemDrive\zabbix2" | Out-Null; `
     New-Item -ItemType directory -Path "$env:SystemDrive\zabbix2\sbin" | Out-Null; `
     New-Item -ItemType directory -Path "$env:SystemDrive\zabbix2\conf" | Out-Null; `
-    & $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agent2.exe -V; `
-    dumpbin /dependents $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agent2.exe; `
+	`
     Copy-Item -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agent2.exe" "$env:SystemDrive\zabbix2\sbin"; `
-    Copy-Item -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION\src\go\conf\zabbix_agent2.win.conf" "$env:SystemDrive\zabbix2\conf"
+    Copy-Item -Path "$env:SystemDrive\zabbix-$env:ZBX_VERSION\src\go\conf\zabbix_agent2.win.conf" "$env:SystemDrive\zabbix2\conf"; `
+	Write-Host 'Zabbix is ready...';
 
 FROM $BASE_IMAGE