diff --git a/.github/workflows/make.yaml b/.github/workflows/make.yaml
index 90bf9ff83..292b6bd10 100644
--- a/.github/workflows/make.yaml
+++ b/.github/workflows/make.yaml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - "main"
+    tags:
+      - "v*"
   pull_request:
     branches:
       - "main"
@@ -26,6 +28,7 @@ jobs:
       - run: "make docker-build"
         env:
           DOCKER_BUILD_FLAGS: "--push"
+          DOCKER_TAG_NAME: ${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || 'latest' }}
   build:
     name: "build"
     runs-on: "ubuntu-22.04"