diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
index 796429fd4..b4b93cac7 100644
--- a/.github/workflows/build_images.yml
+++ b/.github/workflows/build_images.yml
@@ -279,9 +279,6 @@ jobs:
         with:
           name: build-base_${{ matrix.os }}
 
-      - name: Display structure of downloaded files
-        run: ls -R
-
       - name: Prepare tags
         id: prepare_tags
         run: |
@@ -313,7 +310,177 @@ jobs:
           platforms: ${{ steps.platform.outputs.list }}
           push: ${{ secrets.AUTO_PUSH_IMAGES }}
           tags: ${{ steps.prepare_tags.outputs.image_tag_versions }}
-          build-args: BUILD_BASE_IMAGE=zabbix/zabbix-build-base@${{ steps.prepare_tags.outputs.base_tag }}
+          build-args: BUILD_BASE_IMAGE=${{ env.DOCKER_REPOSITORY }}/zabbix-build-base@${{ steps.prepare_tags.outputs.base_tag }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
+             echo "${{ steps.docker_build.outputs.digest }}" > ${{ matrix.build }}_${{ matrix.os }}
+
+      - uses: actions/upload-artifact@v2
+        with:
+         name: ${{ matrix.build }}_${{ matrix.os }}
+         path: ${{ matrix.build }}_${{ matrix.os }}
+         if-no-files-found: error
+
+  build_images:
+    timeout-minutes: 70
+    needs: build_base
+    name: Build ${{ matrix.build }} base on ${{ matrix.os }}
+    env:
+      LATEST_BRANCH: "${{ github.event.repository.default_branch }}"
+      DOCKER_REPOSITORY: "zabbix"
+    strategy:
+      fail-fast: false  
+      matrix:
+        build:
+          - agent
+          - agent2
+          - proxy-mysql
+          - java-gateway
+        os:
+         - alpine
+         - ubuntu
+         - ol
+
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Prepare platform list
+        id: platform
+        run: |
+          DOCKER_PLATFORM="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x"
+
+          if [ "${{ matrix.os }}" == "ubuntu" ]; then
+            DOCKER_PLATFORM="linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le"
+          fi
+
+          if [ "${{ matrix.os }}" == "ol" ]; then
+            DOCKER_PLATFORM="linux/amd64,linux/arm64"
+          fi
+
+          echo ::set-output name=list::${DOCKER_PLATFORM}
+
+      - name: Prepare environment (push)
+        if: github.event_name == 'push'
+        id: prepare_push
+        run: |
+          TAGS_ARRAY=()
+
+          IMAGE_NAME="${{ env.DOCKER_REPOSITORY }}/zabbix-${{ matrix.build }}"
+          GIT_BRANCH="${{ github.ref }}"
+          GIT_BRANCH=${GIT_BRANCH:11}
+
+          echo "::debug::Branch - ${GIT_BRANCH}"
+
+          if [ "${GIT_BRANCH}" == "trunk" ]; then
+            TAGS_ARRAY+=("$IMAGE_NAME:${{ matrix.os }}-${GIT_BRANCH}")
+            TAGS_ARRAY+=("$IMAGE_NAME:${GIT_BRANCH}-${{ matrix.os }}")
+          else
+            TAGS_ARRAY+=("$IMAGE_NAME:${{ matrix.os }}-${GIT_BRANCH}-latest")
+            TAGS_ARRAY+=("$IMAGE_NAME:${GIT_BRANCH}-${{ matrix.os }}-latest")
+          fi
+
+          if [ "${{ matrix.os }}" == "alpine" ] && [ "${LATEST_BRANCH}" == "${GIT_BRANCH}" ]; then
+            TAGS_ARRAY+=("$IMAGE_NAME:latest")
+          fi
+
+          if [ "${LATEST_BRANCH}" == "${GIT_BRANCH}" ]; then
+            TAGS_ARRAY+=("$IMAGE_NAME:${{ matrix.os }}-latest")
+          fi
+
+          TAGS=$(printf -- "%s, " "${TAGS_ARRAY[@]}")
+
+          echo "::debug::Tags - ${TAGS}"
+
+          echo ::set-output name=image_name::${IMAGE_NAME}
+          echo ::set-output name=image_tag_versions::$(printf -- "%s," "${TAGS_ARRAY[@]}")
+          echo ::set-output name=base_tag::${TAGS_ARRAY[1]#*:}
+
+      - name: Prepare environment (release)
+        if: github.event_name == 'release' && github.event.action == 'published'
+        id: prepare_release
+        run: |
+          TAGS_ARRAY=()
+
+          IMAGE_NAME="${{ env.DOCKER_REPOSITORY }}/zabbix-${{ matrix.build }}"
+          RELEASE_VERSION="${{ github.ref }}"
+          RELEASE_VERSION=${RELEASE_VERSION:10}
+          GIT_BRANCH=${RELEASE_VERSION%.*}
+
+          echo "::debug::Release version ${RELEASE_VERSION}. Branch ${GIT_BRANCH}"
+
+          TAGS_ARRAY+=("$IMAGE_NAME:${{ matrix.os }}-${RELEASE_VERSION}")
+          TAGS_ARRAY+=("$IMAGE_NAME:${RELEASE_VERSION}-${{ matrix.os }}")
+
+          if [ "${{ matrix.os }}" == "alpine" ] && [ "${LATEST_BRANCH}" == "${GIT_BRANCH}" ]; then
+            TAGS_ARRAY+=("$IMAGE_NAME:latest")
+          fi
+
+          TAGS=$(printf -- "--tag %s " "${TAGS_ARRAY[@]}")
+
+
+          echo ::set-output name=image_name::${IMAGE_NAME}
+          echo ::set-output name=image_tag_versions::$(printf -- ",%s" "${TAGS_ARRAY[@]}")
+
+      - name: Detect Build Base Image
+        id: build_base_image
+        run: |
+          BUILD_BASE="build-mysql"
+          if [[ "${{ matrix.build }}" == *"pgsql" ]]; then
+              BUILD_BASE="build-pgsql"
+          fi
+          if [[ "${{ matrix.build }}" == *"sqlite3" ]]; then
+              BUILD_BASE="build-mysql"
+          fi
+
+          echo ::set-output name=build_base::${BUILD_BASE}
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: ${{ steps.build_base_image.outputs.build_base }}_${{ matrix.os }}
+
+      - name: Prepare tags
+        id: prepare_tags
+        run: |
+          if [ ! -z "${{ steps.prepare_push.outputs.image_tag_versions }}" ]; then
+              TAGS="${{ steps.prepare_push.outputs.image_tag_versions }}"
+              IMAGE_NAME="${{ steps.prepare_push.outputs.image_name }}"
+          elif [ ! -z "${{ steps.prepare_release.outputs.image_tag_versions }}" ]; then
+              TAGS="${{ steps.prepare_release.outputs.image_tag_versions }}"
+              IMAGE_NAME="${{ steps.prepare_release.outputs.image_name }}"
+          else
+              exit 1
+          fi
+
+          BASE_TAG=$(cat ${{ steps.build_base_image.outputs.build_base }}_${{ matrix.os }})
+
+          echo ::set-output name=image_tag_versions::${TAGS}
+          echo ::set-output name=image_name::${IMAGE_NAME}
+          echo ::set-output name=base_tag::${BASE_TAG}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: ./${{ matrix.build }}/${{ matrix.os }}
+          file: ./${{ matrix.build }}/${{ matrix.os }}/Dockerfile
+          platforms: ${{ steps.platform.outputs.list }}
+          push: false
+          tags: ${{ steps.prepare_tags.outputs.image_tag_versions }}
+          build-args: BUILD_BASE_IMAGE=${{ env.DOCKER_REPOSITORY }}/zabbix-${{ steps.build_base_image.outputs.build_base }}@${{ steps.prepare_tags.outputs.base_tag }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}