diff --git a/.github/workflows/changelog.py b/.github/workflows/changelog.py
index 81e5c441..53780668 100644
--- a/.github/workflows/changelog.py
+++ b/.github/workflows/changelog.py
@@ -2,7 +2,7 @@ import os
 import re
 import sys
 
-raw_git = os.popen('git log next --since="5 days" --pretty=format:"- %h - {USERNAME}*+%al-%an*: %s"').read()
+raw_git = os.popen('git log next --since="24 hours" --pretty=format:"- %h - {USERNAME}*+%al-%an*: %s"').read()
 
 
 def compute_username(line):
diff --git a/.github/workflows/create_nightly_release.yml b/.github/workflows/create_nightly_release.yml
index ca4b7a36..d68a52a2 100644
--- a/.github/workflows/create_nightly_release.yml
+++ b/.github/workflows/create_nightly_release.yml
@@ -55,8 +55,7 @@ jobs:
           zip -r sdcard.zip sdcard
       - name: Create changelog
         run: |
-          # CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - @%an: %s") # Commented out as username are currently broken
-          CHANGELOG=$(git log next --since="24 hours" --pretty=format:"- %h - %s")
+          CHANGELOG=$(python3 .github/workflows/changelog.py)
           CHANGELOG="${CHANGELOG//'%'/'%25'}"
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
           CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"