diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f2fa4ef02d..13adb592b2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve Element
+about: Create a report to help us improve SchildiChat
 title: ''
 labels: ''
 assignees: ''
@@ -31,4 +31,7 @@ If applicable, add screenshots to help explain your problem.
  - App version and store [e.g. 1.0.0 - F-Droid]
  - Homeserver: [e.g. matrix.org]
 
+**Upstream relevance**
+ - Does this issue exist in Element Android?
+
 Add any other context about the problem here.
diff --git a/post_merge.sh b/post_merge.sh
index a7ca07ec42..58659b994a 100755
--- a/post_merge.sh
+++ b/post_merge.sh
@@ -26,6 +26,7 @@ restore_sc() {
 # Keep in sync with pre_merge.sh!
 restore_sc README.md
 restore_sc fastlane
+restore_sc .github
 
 git add -A
 git commit -m "Automatic upstream merge postprocessing"
diff --git a/pre_merge.sh b/pre_merge.sh
index ad2a447b9c..60ed489236 100755
--- a/pre_merge.sh
+++ b/pre_merge.sh
@@ -24,6 +24,7 @@ revert_last 'Resolve required manual intervention in german strings'
 revert_last 'Automatic SchildiChat string correction'
 
 # Keep in sync with post_merge.sh!
+restore_upstream .github
 restore_upstream fastlane
 restore_upstream README.md
 
diff --git a/upstream_.github/ISSUE_TEMPLATE/bug_report.md b/upstream_.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..f2fa4ef02d
--- /dev/null
+++ b/upstream_.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve Element
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. Samsung S6]
+ - OS: [e.g. Android 6.0]
+
+**Additional context**
+ - App version and store [e.g. 1.0.0 - F-Droid]
+ - Homeserver: [e.g. matrix.org]
+
+Add any other context about the problem here.
diff --git a/upstream_.github/ISSUE_TEMPLATE/feature_request.md b/upstream_.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..73c93186d7
--- /dev/null
+++ b/upstream_.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: type:suggestion
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/matrix-sdk.md b/upstream_.github/ISSUE_TEMPLATE/matrix-sdk.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/matrix-sdk.md
rename to upstream_.github/ISSUE_TEMPLATE/matrix-sdk.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/upstream_.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE.md
rename to upstream_.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/upstream_.github/workflows/gradle-wrapper-validation.yml
similarity index 100%
rename from .github/workflows/gradle-wrapper-validation.yml
rename to upstream_.github/workflows/gradle-wrapper-validation.yml
diff --git a/.github/workflows/update-gradle-wrapper.yml b/upstream_.github/workflows/update-gradle-wrapper.yml
similarity index 100%
rename from .github/workflows/update-gradle-wrapper.yml
rename to upstream_.github/workflows/update-gradle-wrapper.yml