diff --git a/.github/workflows/build-availability-oracle.yml b/.github/workflows/build-availability-oracle.yml
index 44479ae..60e49ff 100644
--- a/.github/workflows/build-availability-oracle.yml
+++ b/.github/workflows/build-availability-oracle.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+    tags:
+      - 'v*'
 
 env:
   BASE_IMAGE: ghcr.io/graphprotocol/availability-oracle
@@ -19,12 +21,15 @@ jobs:
 
       - name: Docker meta
         id: docker_meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.BASE_IMAGE }}
           tags: |
             type=sha
-            type=raw,value=latest
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb0a20c..dae6ce9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: Continuous Integration
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
     types: [opened, synchronize, reopened]