diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 45e56672dc..1b042c0d75 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -2,8 +2,6 @@ name: Build container image
 on:
   workflow_dispatch:
   push:
-    branches:
-      - 'main'
     tags:
       - '*'
   pull_request:
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
index 7937c66fa7..641b7d4322 100644
--- a/.github/workflows/build-nightly.yml
+++ b/.github/workflows/build-nightly.yml
@@ -37,6 +37,7 @@ jobs:
             latest=auto
           tags: |
             type=raw,value=nightly
+            type=raw,value=edge
             type=schedule,pattern=nightly-{{date 'YYYY-MM-DD' tz='Etc/UTC'}}
           labels: |
             org.opencontainers.image.description=Nightly build image used for testing purposes