diff --git a/.github/ISSUE_TEMPLATE/pre-release-from-scratch-testing.md b/.github/ISSUE_TEMPLATE/pre-release-from-scratch-testing.md
index 0263015f..d519b801 100644
--- a/.github/ISSUE_TEMPLATE/pre-release-from-scratch-testing.md
+++ b/.github/ISSUE_TEMPLATE/pre-release-from-scratch-testing.md
@@ -23,8 +23,9 @@ the products.
 > Eg:
 >
 > ```md
-> :green_circle: **airflow-scheduled-job**
+> ## :green_circle: airflow-scheduled-job
 >
+> Notes can be left here, for example:
 > The CRD had been updated and I needed to change the following in the manifest:
 > ...
 > ```
@@ -51,8 +52,6 @@ GitHub handle next to the demo to indicate a particular demo was picked up for t
     | xargs -I {} echo "- [ ] [{}](https://docs.stackable.tech/home/nightly/demos/{})"
 -->
 
-<!-- TODO (@Techassi): Test stacks which don't have a demo -->
-
 - [ ] [airflow-scheduled-job](https://docs.stackable.tech/home/nightly/demos/airflow-scheduled-job)
 - [ ] [data-lakehouse-iceberg-trino-spark](https://docs.stackable.tech/home/nightly/demos/data-lakehouse-iceberg-trino-spark)
 - [ ] [end-to-end-security](https://docs.stackable.tech/home/nightly/demos/end-to-end-security)
@@ -67,6 +66,17 @@ GitHub handle next to the demo to indicate a particular demo was picked up for t
 - [ ] [trino-iceberg](https://docs.stackable.tech/home/nightly/demos/trino-iceberg)
 - [ ] [trino-taxi-data](https://docs.stackable.tech/home/nightly/demos/trino-taxi-data)
 
+### Additional stacks
+
+If we have time (otherwise they can be tested and patched after the release)
+
+- [ ] monitoring
+- [ ] logging
+- [ ] dual-hive-hdfs-s3
+- [ ] observability @NickLarsenNZ
+- [ ] tutorial-openldap
+- [ ] openldap
+
 ## Nightly from Scratch Testing Instructions
 
 These instructions are for deploying and completing the nightly demo from scratch.
diff --git a/.github/ISSUE_TEMPLATE/pre-release-upgrade-testing.md b/.github/ISSUE_TEMPLATE/pre-release-upgrade-testing.md
index 2552bd83..ddbdea5f 100644
--- a/.github/ISSUE_TEMPLATE/pre-release-upgrade-testing.md
+++ b/.github/ISSUE_TEMPLATE/pre-release-upgrade-testing.md
@@ -23,8 +23,13 @@ and products do not negatively impact the products.
 > Eg:
 >
 > ```md
-> :green_circle: **airflow-scheduled-job**
+> ## :green_circle: airflow-scheduled-job
 >
+>
+> - :hourglass: current stable (OO.M.X)
+> - :hourglass: upgrade to nightly (pending external dep bumps)
+>
+> Notes can be left here, for example:
 > The CRD had been updated and I needed to change the following in the manifest:
 > ...
 > ```
@@ -51,8 +56,6 @@ GitHub handle next to the demo to indicate a particular demo was picked up for t
     | xargs -I {} echo "- [ ] [{}](https://docs.stackable.tech/home/stable/demos/{})"
 -->
 
-<!-- TODO (@Techassi): Test stacks which don't have a demo -->
-
 - [ ] [airflow-scheduled-job](https://docs.stackable.tech/home/stable/demos/airflow-scheduled-job)
 - [ ] [data-lakehouse-iceberg-trino-spark](https://docs.stackable.tech/home/stable/demos/data-lakehouse-iceberg-trino-spark)
 - [ ] [end-to-end-security](https://docs.stackable.tech/home/stable/demos/end-to-end-security)
@@ -67,6 +70,17 @@ GitHub handle next to the demo to indicate a particular demo was picked up for t
 - [ ] [trino-iceberg](https://docs.stackable.tech/home/stable/demos/trino-iceberg)
 - [ ] [trino-taxi-data](https://docs.stackable.tech/home/stable/demos/trino-taxi-data)
 
+### Additional stacks
+
+If we have time (otherwise they can be tested and patched after the release)
+
+- [ ] monitoring
+- [ ] logging
+- [ ] dual-hive-hdfs-s3
+- [ ] observability @NickLarsenNZ
+- [ ] tutorial-openldap
+- [ ] openldap
+
 ## Stable to Nightly Upgrade Testing Instructions
 
 These instructions are for deploying and completing the stable demo, and then
diff --git a/.github/ISSUE_TEMPLATE/release-from-scratch-testing.md b/.github/ISSUE_TEMPLATE/release-from-scratch-testing.md
index cde8bf61..adaa0fdd 100644
--- a/.github/ISSUE_TEMPLATE/release-from-scratch-testing.md
+++ b/.github/ISSUE_TEMPLATE/release-from-scratch-testing.md
@@ -22,8 +22,9 @@ This is testing that the new release demos work as documented from scratch.
 > Eg:
 >
 > ```md
-> :green_circle: **airflow-scheduled-job**
+> ## :green_circle: airflow-scheduled-job
 >
+> Notes can be left here, for example:
 > The CRD had been updated and I needed to change the following in the manifest:
 > ...
 > ```
@@ -67,6 +68,17 @@ GitHub handle next to the demo to indicate a particular demo was picked up for t
 - [ ] [trino-iceberg](https://docs.stackable.tech/home/nightly/demos/trino-iceberg)
 - [ ] [trino-taxi-data](https://docs.stackable.tech/home/nightly/demos/trino-taxi-data)
 
+### Additional stacks
+
+If we have time (otherwise they can be tested and patched after the release)
+
+- [ ] monitoring
+- [ ] logging
+- [ ] dual-hive-hdfs-s3
+- [ ] observability @NickLarsenNZ
+- [ ] tutorial-openldap
+- [ ] openldap
+
 ### YY.M.X from Scratch Testing Instructions
 
 These instructions are for deploying and completing the YY.M.X demo from scratch.