diff --git a/.github/PULL_REQUEST_TEMPLATE/add_software.md b/.github/PULL_REQUEST_TEMPLATE/add_software.md
new file mode 100644
index 0000000000..d5b68dedb7
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/add_software.md
@@ -0,0 +1,63 @@
+<!-- Pull Request Template for adding software – EESSI Software Layer -->
+<!-- (comments look like this, beginning with what is at the start of this line
+and ending with what is at the end of this one, so they can be multiline!) -->
+
+(If you need a PR template for a rebuild, open the Preview tab in this comment
+and [click here](?expand=1&template=rebuild_software.md). Otherwise delete this line)
+
+## Description
+<!--
+Give some context for the changes introduced by this PR
+- What is the software being added?
+- What domain does it serve?
+- Why are you adding it?
+- ...
+-->
+
+## Target File(s)
+<!--
+Confirm that this PR modifies the correct file(s)
+For new software, the typical path format is:
+- `easystacks/software.eessi.io/<EESSI version>/eessi-<EESSI version>-eb-<EasyBuild version>-<toolchain>.yml`
+Example:
+- `easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.3.0-2025a.yml`
+-->
+
+
+Please verify:
+
+<!-- Mark relevant options with an [x] -->
+- [ ] I am targeting the [**correct EESSI version**](https://www.eessi.io/docs/repositories/versions/)
+  (e.g. `2025.06` for toolchain generation `2025a`, `2023.06` for toolchain generation `2023b`)
+- [ ] I am using the [**latest EasyBuild version**](https://pypi.org/project/easybuild/) (e.g. `5.3.0`)
+- [ ] I selected the **correct toolchain generation** (e.g. `2025a`)
+- [ ] I did **not** modify other unrelated files
+
+<!--
+### Toolchain Notes
+- The toolchain suffix (e.g. `2025a`) defines the compiler/MPI stack.
+- See documentation: https://docs.easybuild.io/common-toolchains/
+Sometimes it can be difficult to figure out which suffix your software belongs to, if in doubt please ask for help on
+the [EESSI slack](https://join.slack.com/t/eessi-hpc/shared_invite/zt-2wg10p26d-m_CnRB89xQq3zk9qxf1k3g)
+-->
+
+## Type of Change
+<!-- Mark relevant options with an [x] -->
+- [ ] New software addition
+- [ ] Version update
+- [ ] Other (please specify):
+
+## Testing
+<!-- Describe how you validated your changes -->
+- [ ] I have tested this PR locally using [**EESSI-extend**](https://www.eessi.io/docs/using_eessi/building_on_eessi/#using-the-eessi-extend-module)
+  <!-- Hint:
+      module load EESSI/<EESSI version>
+      module load EESSI-extend
+      # Show what will be built
+      eb --missing --easystack <path to easystack>
+      # Perform the build
+      eb --robot --easystack <path to easystack>
+  -->
+- [ ] The build completed successfully
+- [ ] The installed software/module loads correctly
+- [ ] Basic functionality has been verified
diff --git a/.github/PULL_REQUEST_TEMPLATE/rebuild_software.md b/.github/PULL_REQUEST_TEMPLATE/rebuild_software.md
new file mode 100644
index 0000000000..c154b9f9a7
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/rebuild_software.md
@@ -0,0 +1,48 @@
+<!-- Pull Request Template for rebuilding software – EESSI Software Layer -->
+<!-- (comments look like this, beginning with what is at the start of this line
+and ending with what is at the end of this one, so they can be multiline!) -->
+
+## Description of rebuild PR
+<!--
+Give some context for the changes introduced by this PR
+- Why is the rebuild necessary?
+- What are the potential positive/negative impacts?
+- ...
+-->
+
+## Target File(s)
+<!--
+Confirm that this PR modifies the correct file(s)
+Rebuilds must be placed under the `rebuilds/` subdirectory:
+- `easystacks/software.eessi.io/<EESSI version>/rebuilds/<date>-eb-<EasyBuild version>-<description>.yml`
+Example:
+- `easystacks/software.eessi.io/2025.06/rebuilds/20260413-eb-5.3.0-RStudio-r_home-patch.yml`
+-->
+
+Please verify:
+
+<!-- Mark relevant options with an [x] -->
+- [ ] This is a rebuild (not a standard addition/update)
+- [ ] I am targeting the [**correct EESSI version**](https://www.eessi.io/docs/repositories/versions/)
+  (e.g. `2025.06` for toolchain generation `2025a`, `2023.06` for toolchain generation `2023b`)
+- [ ] The file is placed in the correct `rebuilds/` directory
+- [ ] I am using the [**latest EasyBuild version**](https://pypi.org/project/easybuild/) (e.g. `5.3.0`)
+- [ ] The filename gives some indication of the reason for the rebuild
+- [ ] The file includes comments explaining **exactly why the rebuild is necessary**
+- [ ] I did **not** modify other unrelated files
+
+## Testing
+<!-- Describe how you validated your changes -->
+<!-- Mark relevant options with an [x] -->
+- [ ] I have tested this PR locally using [**EESSI-extend**](https://www.eessi.io/docs/using_eessi/building_on_eessi/#using-the-eessi-extend-module)
+  <!-- Hint:
+      module load EESSI/<EESSI version>
+      module load EESSI-extend
+      # Show what will be rebuilt 
+      eb --missing --rebuild --easystack <path to easystack>
+      # Perform the build (no dependencies are to be built, so no `--robot`)
+      eb --rebuild --easystack <path to easystack>
+  -->
+- [ ] The build completed successfully
+- [ ] The installed software/module loads correctly
+- [ ] Basic functionality has been verified
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 120000
index 0000000000..4cfa6ba0ae
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1 @@
+PULL_REQUEST_TEMPLATE/add_software.md
\ No newline at end of file