diff --git a/Dockerfiles/agent/windows/Dockerfile b/Dockerfiles/agent/windows/Dockerfile
index 6df78af74..45c19348e 100644
--- a/Dockerfiles/agent/windows/Dockerfile
+++ b/Dockerfiles/agent/windows/Dockerfile
@@ -28,7 +28,7 @@ SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop';"]
 
 WORKDIR C:\zabbix\
 
-COPY --from=builder ["C:\\zabbix", "C:\\zabbix"]
+COPY --from=builder ["C:\\zabbix_output", "C:\\zabbix"]
 COPY [".\\docker-entrypoint.ps1", "C:\\zabbix"]
 
 USER ContainerAdministrator
@@ -37,7 +37,10 @@ RUN $env:PATH = [string]::Format('{0}\zabbix\sbin;{0}\zabbix\bin;', $env:SystemD
     [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);
+    [Environment]::SetEnvironmentVariable('ZBX_HOME', $env:ZBX_HOME, [EnvironmentVariableTarget]::Machine); `
+	`
+	Write-Host ('Verifying Zabbix agent 2 {0} ...' -f $env:ZBX_VERSION); `
+	zabbix_agentd.exe -V;
 
 RUN Set-Location -Path $env:SystemDrive\.; `
     `
diff --git a/Dockerfiles/agent2/windows/Dockerfile b/Dockerfiles/agent2/windows/Dockerfile
index d1969178d..bd3687b16 100644
--- a/Dockerfiles/agent2/windows/Dockerfile
+++ b/Dockerfiles/agent2/windows/Dockerfile
@@ -28,7 +28,7 @@ SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop';"]
 
 WORKDIR C:\zabbix\
 
-COPY --from=builder ["C:\\zabbix2", "C:\\zabbix"]
+COPY --from=builder ["C:\\zabbix_output", "C:\\zabbix"]
 COPY --from=builder ["C:\\mongodb_plugin\\zabbix-agent2-plugin-mongodb.exe", "C:\\zabbix\\zabbix-agent2-plugin\\zabbix-agent2-plugin-mongodb.exe"]
 COPY --from=builder ["C:\\mongodb_plugin\\mongodb.conf", "C:\\zabbix\\conf\\zabbix_agentd.d\\mongodb.conf"]
 COPY --from=builder ["C:\\postgresql_plugin\\zabbix-agent2-plugin-postgresql.exe", "C:\\zabbix\\zabbix-agent2-plugin\\zabbix-agent2-plugin-postgresql.exe"]
@@ -41,7 +41,10 @@ RUN $env:PATH = [string]::Format('{0}\zabbix\sbin;{0}\zabbix\bin;', $env:SystemD
     [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);
+    [Environment]::SetEnvironmentVariable('ZBX_HOME', $env:ZBX_HOME, [EnvironmentVariableTarget]::Machine); `
+	`
+	Write-Host ('Verifying Zabbix agent 2 {0} ...' -f $env:ZBX_VERSION); `
+	zabbix_agent2.exe -V;
 
 RUN Set-Location -Path $env:SystemDrive\.; `
     `
diff --git a/Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2 b/Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2
index ff6b509ab..4bcc366db 100644
--- a/Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2
+++ b/Dockerfiles/build-base/windows/Dockerfile_llvm_clang.agent2
@@ -93,12 +93,6 @@ RUN Set-Location -Path $env:SystemDrive\.; `
     Write-Host 'Verifying install ("git version") ...'; `
     git version; `
 	`
-    Write-Host 'Installing 7z...'; `
-    Start-Process `
-        -FilePath $env:TEMP\7z.msi `
-        -Wait `
-        -ArgumentList '/qn /norestart'; `
-	`
     Write-Host 'Installing Go Lang...'; `
     Expand-Archive -Path $env:TEMP\go-amd64.zip -DestinationPath $env:SystemDrive\; `
     `