diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 887c125..73ae39e 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    tags:
+      - 'v*'
   pull_request:
     branches:
       - master
@@ -38,7 +40,10 @@ jobs:
         with:
           context: .
           push: true
-          tags: sholdee/adguardexporter:latest
+          tags: |
+            sholdee/adguardexporter:latest
+            sholdee/adguardexporter:${{ github.sha }}
+            sholdee/adguardexporter:${{ github.ref_name }}
           platforms: linux/amd64,linux/arm64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache