diff --git a/.github/ISSUE_TEMPLATE/manual_qa_template.yml b/.github/ISSUE_TEMPLATE/manual_qa_template.yml
index 8f6117ae3..082fdb457 100644
--- a/.github/ISSUE_TEMPLATE/manual_qa_template.yml
+++ b/.github/ISSUE_TEMPLATE/manual_qa_template.yml
@@ -1,12 +1,12 @@
 name: "QA Checklist"
 description: "Use this template to manually QA for prod push"
-title: "QA for prod push: Admin #[insert PR number], API #[insert PR number], Utils #[insert PR number]"
+title: "QA checklist for production release: [insert planned release date here]"
 
 body:
 - type: checkboxes
-  id: Logging_in
+  id: sign_in
   attributes:
-    label: Log In
+    label: Sign In
     options:
       - label: notify-staging.app.cloud.gov resolves
       - label: Clicking sign in takes you to Login.gov
@@ -25,9 +25,8 @@ body:
       - label: Formatting looks clean and in place
       - label: Message dashboard populates and shows “pending” until call is made to AWS for delivery receipt
 
-
 - type: checkboxes
-  id: send__copied_template
+  id: send_copied_template
   attributes:
     label: Send a message from copied template
     options:
@@ -37,7 +36,7 @@ body:
 
 
 - type: checkboxes
-  id: send__existing_template
+  id: send_existing_template
   attributes:
     label: Send a message from existing template
     options:
@@ -45,13 +44,25 @@ body:
       - label: All else above persists as true (formatting, send, dashboard, etc)
 
 - type: checkboxes
-  id: download_report
+  id: template_folder_permissions
   attributes:
-    label: Download the csv delivery report
+    label: Checking template folder permissions
     options:
-      - label: Clicking on the csv download directly after a message send downloads a report that contains the data we expect
-      - label: The batch report appears on the main dashboard batch table with accurate information
-      - label: Clicking on the csv download link from the main dashboard downloads a report that contains the data we expect
+      - label: Only the template creator and platform admins should be able to see a new template
+      - label: Adding a non platform admin user to a folder should grant them access to see the templates
+      - label: Removing a non platform admin user to a folder should remove their access to see the templates
+      - label: Platform admins should not be able to be added or removed from template folders, since they have full access regardless
+
+- type: checkboxes
+  id: download_reports
+  attributes:
+    label: Download the CSV delivery reports
+    options:
+      - label: Clicking on the CSV download directly after a message send downloads a report that contains the data we expect
+      - label: Clicking on the CSV download links from the main dashboard downloads a report that contains the data we expect
+      - label: The daily generated batch reports appear at the bottom of the main dashboard batch table with accurate information
+      - label: The daily generated batch report buttons are highlighted appropriately based on which reports are available (1, 3, 5, and 7 day)
+      - label: Downloading the generated batch reports that are available work properly and contain the data that we expect
 
 - type: checkboxes
   id: invite_member