diff --git a/.github/workflows/images_build_windows.yml b/.github/workflows/images_build_windows.yml
index 304eca6fc..9db193ec2 100644
--- a/.github/workflows/images_build_windows.yml
+++ b/.github/workflows/images_build_windows.yml
@@ -94,15 +94,22 @@ jobs:
             $tags=$($tags_array | Foreach-Object { "--tag=$_" })
 
             docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+            if (-not $?) {throw "Failed"}
 
             echo "docker build --file=.\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\Dockerfile.${{ matrix.build }} $tags .\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\"
             docker build --file=.\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\Dockerfile.${{ matrix.build }} $tags .\Dockerfiles\${{ env.BASE_BUILD_NAME }}\windows\
+            if (-not $?) {throw "Failed"}
 
-            echo "docker push image push --all-tags $tags_array[0]"
-            docker image push --all-tags $tags_array[0]
+            Foreach ($tag in $test2) {
+                echo "docker push image push --all-tags $tag"
+                docker image push $tag
+                if (-not $?) {throw "Failed"}
+            }
             docker logout
+            if (-not $?) {throw "Failed"}
 
             $digest=$(docker inspect $tags_array[0] --format "{{.Id}}")
+            if (-not $?) {throw "Failed"}
             echo $digest
             echo "$digest" > ${{ env.BASE_BUILD_NAME }}_${{ matrix.os }}_${{ matrix.build }}
 
@@ -120,7 +127,7 @@ jobs:
     strategy:
       fail-fast: false  
       matrix:
-        build: ${{ fromJson(needs.init_build.outputs.database) }}
+        build: ${{ fromJson(needs.init_build.outputs.components) }}
         os: ${{ fromJson(needs.init_build.outputs.os) }}
 
     runs-on: windows-2022
@@ -179,7 +186,6 @@ jobs:
             docker build --build-arg=BUILD_BASE_IMAGE=${{ steps.base_build.outputs.base_build_image }} --file=.\Dockerfiles\build-mysql\windows\Dockerfile.${{ matrix.build }} $tags .\Dockerfiles\build-mysql\windows\
             if (-not $?) {throw "Failed"}
 
-            echo "docker push image push --all-tags $tags_list"
             Foreach ($tag in $test2) {
                 docker image push $tag
                 if (-not $?) {throw "Failed"}