diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
index 965d82bba..1da71fb91 100644
--- a/.github/workflows/build_images.yml
+++ b/.github/workflows/build_images.yml
@@ -116,6 +116,8 @@ jobs:
           tags: |
             type=ref,event=branch,prefix=${{ matrix.os }}-
             type=ref,event=branch,suffix=-${{ matrix.os }}
+          flavor: |
+            latest=auto
 
       - name: Build and push
         id: docker_build
@@ -179,6 +181,8 @@ jobs:
           tags: |
             type=ref,event=branch,prefix=${{ matrix.os }}-
             type=ref,event=branch,suffix=-${{ matrix.os }}
+          flavor: |
+            latest=auto
 
       - uses: actions/download-artifact@v2
         with:
@@ -248,6 +252,17 @@ jobs:
 
           echo ::set-output name=build_base::${BUILD_BASE}
 
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ env.DOCKER_REPOSITORY }}/zabbix-${{ matrix.build }}
+          tags: |
+            type=ref,event=branch,prefix=${{ matrix.os }}-
+            type=ref,event=branch,suffix=-${{ matrix.os }}
+          flavor: |
+            latest=auto
+
       - uses: actions/download-artifact@v2
         with:
           name: ${{ steps.build_base_image.outputs.build_base }}_${{ matrix.os }}
@@ -269,7 +284,7 @@ jobs:
           file: ./${{ matrix.build }}/${{ matrix.os }}/Dockerfile
           platforms: ${{ steps.platform.outputs.list }}
           push: ${{ secrets.AUTO_PUSH_IMAGES }}
-          tags: ${{ steps.prepare_tags.outputs.image_tag_versions }}
+          tags: ${{ steps.meta.outputs.tags }}
           build-args: BUILD_BASE_IMAGE=${{ steps.base_build.outputs.base_build_image }}
 
       - name: Image digest