diff --git a/.github/workflows/build.yml b/.github/workflows/docker.yml
similarity index 96%
rename from .github/workflows/build.yml
rename to .github/workflows/docker.yml
index 3e381aa..f24610a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/docker.yml
@@ -2,8 +2,8 @@ name: Build and push
 
 on:
   push:
-    branches:
-      - main
+    tags:
+      - '*'
 
 env:
   IMAGE_NAME: docker/babashka-pod-docker
@@ -42,7 +42,7 @@ jobs:
             org.opencontainers.image.revision=${{ env.SHA }}
           tags: |
             latest
-            0.1.0
+            ${{github.ref_name}}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 33204ab..2b07a88 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,8 +2,8 @@ name: Release
 
 on:
   push:
-    branches:
-      - main
+    tags:
+      - '*'
 
 jobs:
   releases-matrix: