diff --git a/.github/workflows/release.yml b/.github/workflows/build-packages.yml
similarity index 84%
rename from .github/workflows/release.yml
rename to .github/workflows/build-packages.yml
index 476c388bc7..ccded3edc6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/build-packages.yml
@@ -1,11 +1,10 @@
-name: Build and Release
-# Start build and release process only on E2E completion on master branch
-# Big chunk of the release process logic is in the mage build targets
+name: Build packages
+# Start build process only on E2E completion
+# Big chunk of the build process logic is in the mage build targets
 on:
   workflow_run:
     workflows: [E2E tests]
     types: [completed]
-    branches: [master]
 
 # Mage's `GenerateEnvFile` talks to GH API to setup tags, versions, etc.
 env:
@@ -17,8 +16,7 @@ env:
 jobs:
   build-packages:
     if: |
-      ${{ github.event.workflow_run.conclusion == 'success' }} || 
-      ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags/') }}
+      ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     environment: production
 
@@ -65,8 +63,7 @@ jobs:
 
   build-swagger:
     if: |
-      ${{ github.event.workflow_run.conclusion == 'success' }} || 
-      ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags/') }}
+      ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     environment: production
     needs: [build-packages]
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c5531d91a1..ab79e58419 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -1,20 +1,15 @@
 name: E2E tests
 # Run E2E tests after Unit tests (currently, they run on PRs)
-# and on "v*" tags push events
 on:
   workflow_run:
     workflows: [Unit tests and linters]
     types: [completed]
-  push:
-    tags:
-      - "v*"
 
 jobs:
   e2e-tests:
-    # Parent workflow (unit tests) must succeed or it must be a tag push
+    # Parent workflow (unit tests) must succeed
     if: |
-      ${{ github.event.workflow_run.conclusion == 'success' }} || 
-      ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags/') }}
+      ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     environment: production