diff --git a/.github/release.yml b/.github/release.yml
deleted file mode 100644
index 49f96b49..00000000
--- a/.github/release.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
-# https://github.com/bcoe/conventional-release-labels
-# https://dev.to/github/how-to-automatically-generate-release-notes-for-your-project-2ng8
-# https://www.conventionalcommits.org/en/v1.0.0/
-
-# github release pre-defined template
-changelog:
-  exclude:
-    labels:
-      - ignore-for-release
-  categories:
-    - title: 🚀 Features
-      labels:
-        - feature
-    - title: 🐛 Bug Fixes
-      labels:
-        - fix
-        - bug
-    - title: ♻️ Changes
-      labels:
-        - changed
-        - enhancement
-        - refactor
-    - title: ⛔️ Deprecated
-      labels:
-        - deprecated
-    - title: 🗑 Removed
-      labels:
-        - removed
-    - title: 🔐 Security
-      labels:
-        - security
-    - title: 📄 Documentation
-      labels:
-        - docs
-        - documentation
-    - title: 🧩 Dependency Updates
-      labels:
-        - deps
-        - dependencies
-    - title: 🧰 Maintenance
-      label: 'chore'
-    - title: 🧺 Miscellaneous #Everything except ABAP
-      label: misc
-    - title: Other Changes
-      labels:
-        - "*"
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 435365f9..30ec15bf 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -6,6 +6,7 @@
    push:
      branches:
        - main
+       - develop
 
  jobs:
    update_release_draft:
diff --git a/src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightCommand.cs b/src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightCommand.cs
index 2f64f789..a82842ac 100644
--- a/src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightCommand.cs
+++ b/src/Services/Flight/tests/EndToEndTest/Fakes/FakeCreateFlightCommand.cs
@@ -10,7 +10,7 @@ public sealed class FakeCreateFlightCommand : AutoFaker<CreateFlightCommand>
     public FakeCreateFlightCommand()
     {
         RuleFor(r => r.Id, _ => SnowFlakIdGenerator.NewId());
-        RuleFor(r => r.FlightNumber, r => r.Random.Number(1000, 2000).ToString());
+        RuleFor(r => r.FlightNumber, r => "12FF");
         RuleFor(r => r.DepartureAirportId, _ => 1);
         RuleFor(r => r.ArriveAirportId, _ => 2);
         RuleFor(r => r.Status, _ => FlightStatus.Flying);
diff --git a/src/Services/Flight/tests/EndToEndTest/Flight/Features/GetFlightByIdTests.cs b/src/Services/Flight/tests/EndToEndTest/Flight/Features/GetFlightByIdTests.cs
index e4a0e9ae..21daea48 100644
--- a/src/Services/Flight/tests/EndToEndTest/Flight/Features/GetFlightByIdTests.cs
+++ b/src/Services/Flight/tests/EndToEndTest/Flight/Features/GetFlightByIdTests.cs
@@ -25,8 +25,6 @@ public async Task should_retrive_a_flight_by_id_currectly()
         //Arrange
         var command = new FakeCreateFlightCommand().Generate();
         await Fixture.SendAsync(command);
-        (await Fixture.WaitForPublishing<FlightCreated>()).Should().Be(true);
-        (await Fixture.WaitForConsuming<FlightCreated>()).Should().Be(true);
         (await Fixture.ShouldProcessedPersistInternalCommand<CreateFlightMongoCommand>()).Should().Be(true);
 
         // Act