diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index bd17639793..0000000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-github: [staabm]
diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
deleted file mode 100644
index e87309e1c5..0000000000
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: "\U0001F41E Report an error or problem"
-about: Before you start, check whether a similar issue was already reported. Search via https://github.com/redaxo/core/issues
-
----
-
-**Description / Beschreibung**
-
-**Affected versions / Verwendete Versionen**
-
-<!-- Insert a system report via `REDAXO > System > System report > As Markdown` or tell us more about the system:
-Füge hier einen Systembericht ein via `REDAXO > System > Systembericht > Als Markdown`, oder teile uns mehr über das System mit: -->
-
-REDAXO: 
-PHP:
-Database:
-Browser: 
-AddOns:
-
-**Did it whoops? / Whoops erhalten?**
-
-<!-- Don't forget to insert the stacktrace to provide more details and recieve answers faster. Use `COPY MARKDOWN` right under the message and paste it here. -->
-<!-- Vergiss nicht, den Stracktrace hier einzufügen, um genauere Details zur Verfügung zu stellen und schneller eine Antwort zu erhalten. Klicke `COPY MARKDOWN` unterhalb der Fehlermeldung und füge es hier ein. -->
diff --git a/.github/ISSUE_TEMPLATE/---security-issue.md b/.github/ISSUE_TEMPLATE/---security-issue.md
deleted file mode 100644
index 8426c2dc7d..0000000000
--- a/.github/ISSUE_TEMPLATE/---security-issue.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: "⛔ Security Issue"
-about: Please don't disclose security-releated issues publicy / Bitte melde keine Sicherheitsprobleme öffentlich
-
----
-
-PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY.
-
-If you have found a security issue in REDAXO, please send the details to info@redaxo.de and don't disclose it publicly until we can provide a fix for it. 
-Further information on security, you can find on redaxo.org (german): https://redaxo.org/support/sicherheit/ 
-
-BITTE VERÖFFENTLICHEN SIE KEINE SICHERHEITSRELEVANTEN PROBLEME.
-
-Wenn Sie ein Sicherheitsproblem in REDAXO gefunden haben, senden Sie bitte die Details an info@redaxo.de und geben Sie diese nicht öffentlich bekannt, bis wir eine Lösung dafür gefunden haben. 
-Weitere Informationen zum Thema Sicherheit: https://redaxo.org/support/sicherheit/
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000000..be653e2466
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,24 @@
+---
+name: "\U0001F41E Report an error or problem"
+about: Before you start, check whether a similar issue was already reported. Search via https://github.com/redaxo/core/issues
+labels: Bug
+
+---
+
+### Description
+
+
+
+### Affected versions
+
+<!-- Insert a system report via `REDAXO > System > System report > As Markdown` or tell us more about the system: -->
+
+REDAXO:
+PHP:
+Database:
+Browser:
+AddOns:
+
+### Did it whoops?
+
+<!-- Don't forget to insert the stacktrace to provide more details and receive answers faster. Use `COPY MARKDOWN` right under the message and paste it here. -->
diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
similarity index 79%
rename from .github/ISSUE_TEMPLATE/---feature-request.md
rename to .github/ISSUE_TEMPLATE/feature-request.md
index cadc3487d0..b12ebd0e85 100644
--- a/.github/ISSUE_TEMPLATE/---feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,7 +1,6 @@
 ---
 name: "\U0001F4A1 Suggest an idea or feature"
 about: Before you start, check whether a similar suggestion was already made. Search via https://github.com/redaxo/core/issues
+labels: Feature
 
 ---
-
-**Feature description / Feature Beschreibung**
diff --git a/SECURITY.md b/SECURITY.md
index 18358e5570..6d537b980b 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,6 +2,8 @@
 
 ## Reporting a Vulnerability
 
-If you discover a security issue with REDAXO or a related package, please contact us
-via `info {at} redaxo.org` instead of using a public channel. That way we can work on
-a fix together before everyone knows how to exploit a potential issue. Thank you!
+If you discover a security issue with REDAXO or a related package, please
+contact us via https://github.com/redaxo/core/security/advisories/new or
+`info {at} redaxo.org` instead of using a public channel. That way we can work
+on a fix together before everyone knows how to exploit a potential issue. Thank
+you!