diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 005ca16d..47cf3a1b 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -3,9 +3,9 @@ name: ci
 on:
   push:
     branches:
-      - 'master'
-      - 'devel'
-      - 'docker-github-actions'
+      - "master"
+      - "devel"
+      - "docker-github-actions"
 
 jobs:
   docker:
@@ -17,12 +17,19 @@ jobs:
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
+      -
+        name: Docker meta tag
+        id: docker_meta
+        uses: docker/metadata-action@v3.5.0
+        with:
+          images: guysoft/custompios
+          tag-sha: true
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -35,6 +42,7 @@ jobs:
           file: src/Dockerfile
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
-          tags: guysoft/custompios:devel
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
           secrets: |
             GIT_AUTH_TOKEN=${{ secrets.MY_GITHUB_TOKEN }}