diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b45139ad09..a7fef058bc 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -15,11 +15,19 @@
 + [ ] Are the changes covered by tests and docstrings?
 + [ ] Fill out the short summary sections 👇
 
+
 ## Major / Breaking Changes
 - ...
 
-## Bugfixes / New features
+## New features
+- ...
+
+## Bugfixes
 - ...
 
-## Docs / Maintenance
+## Documentation
 - ...
+
+## Maintenance
+- ...
+
diff --git a/.github/release.yml b/.github/release.yml
index a9230a32e8..d2f9b05bee 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -11,16 +11,15 @@ changelog:
     - title: Major Changes 🛠
       labels:
         - major
-    - title: New Features & Bugfixes 🎉
+    - title: New Features 🎉
       labels:
-        - bug
         - enhancements
-        - feature-request
-    - title: Docs & Maintenance 🔧
+        - feature request
+    - title: Bugfixes 🪲
       labels:
+        - bug
+    - title: Documentation 📖
         - docs
-        - installation
-        - maintenance
-        - pre-commit
-        - tests
+    - title: Maintenance 🔧
+      labels:
         - "*"
\ No newline at end of file
diff --git a/bin/downstream_pr.sh b/bin/downstream_pr.sh
index 76f111c07e..2e3f784458 100644
--- a/bin/downstream_pr.sh
+++ b/bin/downstream_pr.sh
@@ -43,4 +43,4 @@ pre-commit run --all
 git push origin downstream_$1
 # get the informative title
 title=$(curl https://api.github.com/repos/aesara-devs/aesara/pulls/$1 2>/dev/null | jq '.title')
-gh pr create --repo pymc-devs/pytensor --title "Downstreaming Aesara PR $1: $title" --body "Downstreaming https://github.com/aesara-devs/aesara/pull/$1. PR port done by downstream_pr.sh script."
+gh pr create --repo pymc-devs/pytensor --label "aesara downstream" --title "🔄 From Aesara: $1: $title" --body "Downstreaming https://github.com/aesara-devs/aesara/pull/$1. PR port done by downstream_pr.sh script."