diff --git a/.github/workflows/close-old-issues.yml b/.github/workflows/close-old-issues.yml
index 8efb77dad..4b1da1d7c 100644
--- a/.github/workflows/close-old-issues.yml
+++ b/.github/workflows/close-old-issues.yml
@@ -1,4 +1,4 @@
-name: Close Old Issues
+name: Close Test Issues
 on:
   workflow_dispatch:
     inputs:
@@ -17,15 +17,15 @@ jobs:
     steps:
     - uses: actions/stale@v4.1.1
       with:
-        stale-issue-label:  ${{ env.stale-label }}
-        exempt-issue-labels:  ${{ env.stale-exempt-label }}
+        stale-issue-label: ${{ env.stale-label }}
+        exempt-issue-labels: ${{ env.stale-exempt-label }}
         days-before-pr-stale: -1
         days-before-pr-close: -1
-        only-label: ${{ env.only-label }}
-        days-before-stale:  ${{ env.stale-days }}
-        stale-issue-message: "This issue is now marked as ' ${{ env.stale-label }}' due to there being no activity on it for the past  ${{ env.stale-days }} days. Unless the ' ${{ env.stale-label }}' label is removed or the issue is commented on, this will be remain open for at least  ${{ env.close-days }} days and then it may be closed. If you would like to make this issue exempt from getting stale, please add the ' ${{ env.stale-exempt-label }}' label."
-        days-before-close:  ${{ env.close-days }}
+        only-labels: ${{ env.only-label }}
+        days-before-stale: ${{ env.stale-days }}
+        stale-issue-message: "This issue is now marked as '${{ env.stale-label }}' due to there being no activity on it for the past ${{ env.stale-days }} days. Unless the '${{ env.stale-label }}' label is removed or the issue is commented on, this will be remain open for at least ${{ env.close-days }} days and then it may be closed. If you would like to make this issue exempt from getting stale, please add the '${{ env.stale-exempt-label }}' label."
+        days-before-close: ${{ env.close-days }}
         close-issue-reason: not_planned
-        close-issue-message: "This issue is now closed due to there being no activity on it for the past  ${{ env.close-days }} days since being marked as ' ${{ env.stale-label }}'."
+        close-issue-message: "This issue is now closed due to there being no activity on it for the past ${{ env.close-days }} days since being marked as '${{ env.stale-label }}'."
         operations-per-run: 50
 
diff --git a/.github/workflows/close-stale-issues.yml b/.github/workflows/close-stale-issues.yml
index d4e3ba88a..b0af33bdf 100644
--- a/.github/workflows/close-stale-issues.yml
+++ b/.github/workflows/close-stale-issues.yml
@@ -21,7 +21,7 @@ jobs:
       with:
         stale-issue-label: ${{ env.stale-label }}
         exempt-issue-labels: ${{ env.stale-exempt-label }}
-        only-label: ${{ env.only-label }}
+        only-labels: ${{ env.only-label }}
         days-before-pr-stale: -1
         days-before-pr-close: -1
         days-before-stale: ${{ env.stale-days }}
diff --git a/.github/workflows/test-bot.yml b/.github/workflows/test-bot.yml
index d92bd94cd..7f9a179a0 100644
--- a/.github/workflows/test-bot.yml
+++ b/.github/workflows/test-bot.yml
@@ -1,4 +1,4 @@
-name: Close Test Issues
+name: Close Old Issues
 on:
   workflow_dispatch:
     inputs:
@@ -16,13 +16,13 @@ jobs:
     steps:
     - uses: actions/stale@v4.1.1
       with:
-        stale-issue-label:  ${{ env.stale-label }}
-        exempt-issue-labels:  ${{ env.stale-exempt-label }}
+        stale-issue-label: ${{ env.stale-label }}
+        exempt-issue-labels: ${{ env.stale-exempt-label }}
         days-before-pr-stale: -1
         days-before-pr-close: -1
-        days-before-stale:  ${{ env.stale-days }}
-        stale-issue-message: "This issue is now marked as ' ${{ env.stale-label }}' due to there being no activity on it for the past  ${{ env.stale-days }} days. Unless the ' ${{ env.stale-label }}' label is removed or the issue is commented on, this will be remain open for at least  ${{ env.close-days }} days and then it may be closed. If you would like to make this issue exempt from getting stale, please add the ' ${{ env.stale-exempt-label }}' label."
-        days-before-close:  ${{ env.close-days }}
+        days-before-stale: ${{ env.stale-days }}
+        stale-issue-message: "This issue is now marked as '${{ env.stale-label }}' due to there being no activity on it for the past ${{ env.stale-days }} days. Unless the '${{ env.stale-label }}' label is removed or the issue is commented on, this will be remain open for at least ${{ env.close-days }} days and then it may be closed. If you would like to make this issue exempt from getting stale, please add the '${{ env.stale-exempt-label }}' label."
+        days-before-close: ${{ env.close-days }}
         close-issue-reason: not_planned
-        close-issue-message: "This issue is now closed due to there being no activity on it for the past  ${{ env.close-days }} days since being marked as ' ${{ env.stale-label }}'."
+        close-issue-message: "This issue is now closed due to there being no activity on it for the past ${{ env.close-days }} days since being marked as '${{ env.stale-label }}'."
         operations-per-run: 50