diff --git a/.github/scripts/bake-metadata.py b/.github/scripts/bake-metadata.py
index 25c466de86a..3237516d549 100755
--- a/.github/scripts/bake-metadata.py
+++ b/.github/scripts/bake-metadata.py
@@ -207,15 +207,19 @@ def get_cache_from(self, target: Target) -> List[str]:
 
 @dataclass
 class ReleaseEvent(BaseEvent):
-    release_name: str
+    tag_name: str
     commit_hash: str
+    draft: bool
 
     def version_string(self):
-        return f"{self.release_name} {short_hash(self.commit_hash)}"
+        return f"{self.get_stable_version()} {short_hash(self.commit_hash)}"
 
     def get_stable_version(self) -> str:
         # stable/osrd-front:1.0-devel  # 1.0 XXXX
-        return self.release_name
+        name = self.tag_name
+        if self.draft:
+            name = f"{name}-draft"
+        return name
 
     def get_stable_image_namer(self) -> ImageNamer:
         return release_image
@@ -252,7 +256,12 @@ def parse_event(context) -> Event:
         return MergeGroupEvent(commit_hash, target_branch)
 
     if event_name == "release":
-        return ReleaseEvent(ref, commit_hash)
+        release = event["release"]
+        return ReleaseEvent(
+            release["tag_name"],
+            commit_hash,
+            release["draft"],
+        )
 
     if event_name in ("workflow_dispatch", "push"):
         return BranchEvent(ref_name, protected, commit_hash)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c0cca1c6d26..a971b28c120 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,13 @@ jobs:
           GITHUB_CONTEXT: ${{ toJson(github) }}
         run: |
           set -eo pipefail
+          echo ::group::Github context
+          python3 -m json.tool <<< "${GITHUB_CONTEXT}"
+          echo ::endgroup::
+
+          echo ::group::Bake metadata
           .github/scripts/bake-metadata.py | tee bake-metadata.json
+          echo ::endgroup::
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3