diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml
index b4b9893ca..615c42262 100644
--- a/.github/workflows/images_build_windows.yml
+++ b/.github/workflows/images_build_windows.yml
@@ -120,7 +120,7 @@ jobs:
          path: ${{ env.BASE_BUILD_NAME }}_${{ matrix.os }}_${{ matrix.build }}
          if-no-files-found: error
 
-  build_base_database:
+  build_components:
     timeout-minutes: 70
     needs: [ "build_base", "init_build"]
     name: Build ${{ matrix.build }} sources on ${{ matrix.os }}
@@ -146,7 +146,7 @@ jobs:
           flavor: |
             latest=false
 
-      - name: Download SHA256 tag  build-base:${{ matrix.os }}
+      - name: Download SHA256 tag build-base:${{ matrix.os }}
         uses: actions/download-artifact@v2.0.10
         with:
           name: ${{ env.BASE_BUILD_NAME }}_${{ matrix.os }}_${{ matrix.build }}
@@ -188,13 +188,13 @@ jobs:
       - name: Upload SHA256 tag
         uses: actions/upload-artifact@v2.2.4
         with:
-         name: base-mysql_${{ matrix.os }}_${{ matrix.build }})
-         path: base-mysql_${{ matrix.os }}_${{ matrix.build }})
+         name: base-mysql_${{ matrix.os }}_${{ matrix.build }}
+         path: base-mysql_${{ matrix.os }}_${{ matrix.build }}
          if-no-files-found: error
 
   build_images:
     timeout-minutes: 70
-    needs: [ "build_base_database", "init_build"]
+    needs: [ "build_components", "init_build"]
     name: Build ${{ matrix.build }} on ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -217,12 +217,12 @@ jobs:
           flavor: |
             latest=false
 
-      - name: Download SHA256 tag for ${{ steps.build_base_image.outputs.build_base }}:${{ matrix.os }}
+      - name: Download SHA256 tag for build-components:${{ matrix.os }}
         uses: actions/download-artifact@v2.0.10
         with:
           name: base-mysql_${{ matrix.os }}_${{ matrix.build }}
 
-      - name: Retrieve ${{ steps.build_base_image.outputs.build_base }}:${{ matrix.os }} SHA256 tag
+      - name: Retrieve build-components:${{ matrix.os }} SHA256 tag
         id: base_build
         run: |
           $base_tag=$(cat base-mysql_${{ matrix.os }}_${{ matrix.build }} )
diff --git a/Dockerfiles/build-mysql/windows/Dockerfile.agent b/Dockerfiles/build-mysql/windows/Dockerfile.agent
index 3b66ed6ae..f33915346 100644
--- a/Dockerfiles/build-mysql/windows/Dockerfile.agent
+++ b/Dockerfiles/build-mysql/windows/Dockerfile.agent
@@ -52,7 +52,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
         MODBLIBDIR=$env:SystemDrive\libmodbus\src\win32\$env:BUILD_ARCH\Release `
         $env:ZBX_COMPONENT; `
     `
-    Write-Host 'Verifying build ("zabbix_agent2.exe -V") ...'; `
+    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; `
     `