diff --git a/.github/workflows/format_and_linting.yml b/.github/workflows/format_and_linting.yml
index 14da62eb0..af782030c 100644
--- a/.github/workflows/format_and_linting.yml
+++ b/.github/workflows/format_and_linting.yml
@@ -2,9 +2,7 @@ name: Check format and run linters
 
 on:
   push:
-    branches: [main, test-ci]
-    tags:
-      - 'v*'
+    branches: main
   pull_request:
     types: [opened, synchronize, reopened]
 
diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml
index 2446b5848..32b308a53 100644
--- a/.github/workflows/macos_build.yml
+++ b/.github/workflows/macos_build.yml
@@ -5,8 +5,6 @@ on:
   push:
     branches:
       - main
-    tags:
-      - 'v*'
   pull_request:
 
 jobs:
diff --git a/.github/workflows/release.yml b/.github/workflows/prepare_release.yml
similarity index 98%
rename from .github/workflows/release.yml
rename to .github/workflows/prepare_release.yml
index 42655cc95..a55a69bc9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/prepare_release.yml
@@ -1,13 +1,10 @@
-# Release packages for GNU/Linux and MacOS.
-name: Release
+# Prepare release packages for GNU/Linux and MacOS on private stores.
+name: Prepare Release
 
 on:
-  workflow_run:
-    workflows: [AwsEc2BuildCpu, AwsEc2BuildGpu, MacOsBuild]
-    branches:
-      - main
-    types:
-      - completed
+  push:
+    tags:
+      - 'v[0-9]+.*'
 
 env:
   DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete-compiler
diff --git a/.github/workflows/start_aws_builds.yml b/.github/workflows/start_aws_builds.yml
index 409776969..a63e936cc 100644
--- a/.github/workflows/start_aws_builds.yml
+++ b/.github/workflows/start_aws_builds.yml
@@ -3,10 +3,8 @@ name: Start all AWS builds
 
 on:
   push:
-    branches:
+    branch:
       - 'main'
-    tags:
-      - 'v*'
   workflow_dispatch:
 
 jobs: