diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index ced7379718..210e25d723 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -712,6 +712,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - run: sleep 1m  # try avoiding github api rate limit
       - uses: ./.github/actions/ui-comment
 
   core_upload_emu:
diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml
index abb26e2c90..bfbe6a52f6 100644
--- a/.github/workflows/legacy.yml
+++ b/.github/workflows/legacy.yml
@@ -139,6 +139,8 @@ jobs:
           status: ${{ job.status }}
         continue-on-error: true
         if: ${{ always() && matrix.coins == 'universal' }}
+      - run: echo "${{ env.PULL_COMMENT }}" >> $GITHUB_STEP_SUMMARY
+        if: ${{ always() && matrix.coins == 'universal' }}
 
   legacy_upgrade_test:
     name: Upgrade test
@@ -217,14 +219,6 @@ jobs:
           aws s3 sync --only-show-errors master_diff s3://data.trezor.io/dev/firmware/master_diff/${{ github.run_id }}
         continue-on-error: true
 
-  legacy_ui_comment:
-    name: Post comment with UI diff URLs
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/ui-comment
-
   legacy_upload_emu:
     name: Upload emulator binaries
     if: github.event_name == 'schedule'