diff --git a/.github/workflows/metrics-collector.yml b/.github/workflows/metrics-collector.yml
index 174be165c2a..80f42c00bb3 100644
--- a/.github/workflows/metrics-collector.yml
+++ b/.github/workflows/metrics-collector.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Get app token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v2
         id: get-github-app-token
         with:
           app-id: ${{secrets.APP_ID}}
diff --git a/.github/workflows/milestoned_to_project.yml b/.github/workflows/milestoned_to_project.yml
index e88b02f092e..adfdff84eb5 100644
--- a/.github/workflows/milestoned_to_project.yml
+++ b/.github/workflows/milestoned_to_project.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Get app token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v2
         id: get-github-app-token
         with:
           app-id: ${{secrets.APP_ID}}
diff --git a/tempodb/blocklist/poller.go b/tempodb/blocklist/poller.go
index 2326635a447..22da96a7676 100644
--- a/tempodb/blocklist/poller.go
+++ b/tempodb/blocklist/poller.go
@@ -175,7 +175,7 @@ func (p *Poller) Do(parentCtx context.Context, previous *List) (PerTenant, PerTe
 		if parentCtx.Err() != nil {
 			// Wait for our work to complete.
 			wg.Wait()
-			return nil, nil, nil
+			return nil, nil, parentCtx.Err()
 		}
 
 		// Exit early if we have exceeded our tolerance for number of failing tenants.