diff --git a/.github/workflows/label-github-issues-by-context.yml b/.github/workflows/label-github-issues-by-context.yml
index 11b86ee3848..c37266102e7 100644
--- a/.github/workflows/label-github-issues-by-context.yml
+++ b/.github/workflows/label-github-issues-by-context.yml
@@ -8,20 +8,16 @@ jobs:
     name: "Add Labels to Issues.  Safe to Merge on fail"
     runs-on: ubuntu-24.04
     steps:
-      - name: Authenticate as GitHub App
-        uses: actions/create-github-app-token@v2
-        id: get-app-token
-        with:
-          owner: "airbytehq"
-          repositories: "airbyte"
-          app-id: ${{ secrets.OCTAVIA_BOT_APP_ID }}
-          private-key: ${{ secrets.OCTAVIA_BOT_PRIVATE_KEY }}
+      # TODO: Replace PAT with a GitHub App token.
+      # The "private-action-loader" action does not seem to be compatible with it,
+      # so we should consider moving off of this specialized action and onto a normal
+      # action step.
       - name: Run Issue Command from workflow-actions
         uses: nick-fields/private-action-loader@v3
         with:
-          pal-repo-token: "${{ steps.get-app-token.outputs.token }}"
+          pal-repo-token: "${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}"
           pal-repo-name: airbytehq/workflow-actions@production
           # the following input gets passed to the private
-          token: "${{ steps.get-app-token.outputs.token }}"
+          token: "${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}"
           # ref: https://github.com/airbytehq/workflow-actions/blob/main/src/bin_issue.ts
           command: "issue"
diff --git a/.github/workflows/label-prs-by-context.yml b/.github/workflows/label-prs-by-context.yml
index b3d05a8520a..c1893a2eafa 100644
--- a/.github/workflows/label-prs-by-context.yml
+++ b/.github/workflows/label-prs-by-context.yml
@@ -10,21 +10,15 @@ jobs:
     name: "Add Labels to PRs.  Safe to Merge on fail"
     runs-on: ubuntu-24.04
     steps:
-      - name: Authenticate as GitHub App
-        uses: actions/create-github-app-token@v2
-        id: get-app-token
-        with:
-          owner: "airbytehq"
-          repositories: |
-            airbyte
-            workflow-actions
-          app-id: ${{ secrets.OCTAVIA_BOT_APP_ID }}
-          private-key: ${{ secrets.OCTAVIA_BOT_PRIVATE_KEY }}
+      # TODO: Replace PAT with a GitHub App token.
+      # The "private-action-loader" action does not seem to be compatible with it,
+      # so we should consider moving off of this specialized action onto a normal
+      # action step.
       - name: Run Issue Command from workflow-actions
         uses: nick-fields/private-action-loader@v3
         with:
-          pal-repo-token: "${{ steps.get-app-token.outputs.token }}"
+          pal-repo-token: "${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}"
           pal-repo-name: airbytehq/workflow-actions@production
           # the following input gets passed to the private action
-          token: "${{ steps.get-app-token.outputs.token }}"
+          token: "${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}"
           command: "pull"