diff --git a/.github/PULL_REQUEST_TEMPLATES/pre-release-nightly-demos.md b/.github/PULL_REQUEST_TEMPLATES/pre-release-nightly-demos.md
new file mode 100644
index 00000000..e1961b2e
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATES/pre-release-nightly-demos.md
@@ -0,0 +1,53 @@
+# Run and Update Demos on Nightly for Stackable Release XX.(X)X
+
+<!--
+    Make sure to update the link in 'issues/.github/ISSUE_TEMPLATE/release.md'
+    when you rename this file.
+-->
+
+<!--
+    Replace 'TRACKING_ISSUE' with the applicable release tracking issue number.
+-->
+
+Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
+
+> [!NOTE]
+> Demos run on the latest stable release by default. This PR includes changes
+> to commands, documentation and UI screenshots when running the demos on
+> nightly instead. The recommended workflow looks like this:
+>
+> 1. Create a `.env` file in your local copy of this repository.
+> 2. Create local stack and demo definition files, like `stacks-v2.local.yaml`
+>    and `demos-v2.local.yaml`. They should use the nightly version instead of
+>    stable. They also might need to point to local manifests instead of remote
+>    ones.
+> 3. Add the `STACKABLE_STACK_FILES` and `STACKABLE_DEMO_FILES` env vars to the
+>    file. They should point to the absolute path of your local stack and demo
+>    definition files.
+> 4. Install the demo as usual ` stackablectl demo install <DEMO>`.
+> 5. Update the documentation and images when required.
+
+<!--
+    The following list was generated by:
+
+    yq '.demos | keys' demos/demos-v2.yaml \
+    | sed -e 's/- //g' \
+    | sort \
+    | xargs -I {} echo "- [ ] [{}](https://docs.stackable.tech/home/nightly/demos/{})"
+-->
+
+```[tasklist]
+### Demos
+- [ ] [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)
+- [ ] [hbase-hdfs-load-cycling-data](https://docs.stackable.tech/home/nightly/demos/hbase-hdfs-load-cycling-data)
+- [ ] [jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data](https://docs.stackable.tech/home/nightly/demos/jupyterhub-pyspark-hdfs-anomaly-detection-taxi-data)
+- [ ] [logging](https://docs.stackable.tech/home/nightly/demos/logging)
+- [ ] [nifi-kafka-druid-earthquake-data](https://docs.stackable.tech/home/nightly/demos/nifi-kafka-druid-earthquake-data)
+- [ ] [nifi-kafka-druid-water-level-data](https://docs.stackable.tech/home/nightly/demos/nifi-kafka-druid-water-level-data)
+- [ ] [signal-processing](https://docs.stackable.tech/home/nightly/demos/signal-processing)
+- [ ] [spark-k8s-anomaly-detection-taxi-data](https://docs.stackable.tech/home/nightly/demos/spark-k8s-anomaly-detection-taxi-data)
+- [ ] [trino-iceberg](https://docs.stackable.tech/home/nightly/demos/trino-iceberg)
+- [ ] [trino-taxi-data](https://docs.stackable.tech/home/nightly/demos/trino-taxi-data)
+```
diff --git a/.gitignore b/.gitignore
index 2eea525d..4c622f17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,8 @@
-.env
\ No newline at end of file
+# Environment variables, for example for stackablectl
+.env
+
+# Local demo and stack definition files
+stacks-v1.local.yaml
+stacks-v2.local.yaml
+demos-v1.local.yaml
+demos-v2.local.yaml
\ No newline at end of file