diff --git a/.gitlab/issue_templates/default.md b/.gitlab/issue_templates/default.md
index 695eb7646a..28149811a8 100644
--- a/.gitlab/issue_templates/default.md
+++ b/.gitlab/issue_templates/default.md
@@ -16,16 +16,16 @@
 <!-- If this happens on your device and has to do with the user interface, it's client-side. If this happens on either with the API or the backend, or you got a server-side error in the client, it's server-side. -->
 
 <!-- Uncomment (remove surrounding arrow signs) the following line(s) to specify the category of this issue. -->
-<!-- /label Server -->
-<!-- /label Client -->
-<!-- /label Mobile -->
-<!-- /label Third-party-client -->
-<!-- /label Docs -->
-<!-- /label Locale -->
-<!-- /label "Build from source" -->
-<!-- /label Container -->
-<!-- /label "Firefish API" -->
-<!-- /label "Mastodon API" -->
+<!-- * Server -->
+<!-- * Client -->
+<!-- * Mobile -->
+<!-- * Third-party-client -->
+<!-- * Docs -->
+<!-- * Locale -->
+<!-- * "Build from source" -->
+<!-- * Container -->
+<!-- * "Firefish API" -->
+<!-- * "Mastodon API" -->
 
 ## What happened?
 <!-- Please give us a brief description of what happened. -->
@@ -81,8 +81,7 @@ By submitting this issue, you agree to follow our [Contribution Guidelines](http
 - [ ] I have searched the issue tracker for similar issues, and this is not a duplicate.
 
 ## Are you willing to fix this bug? (optional)
-<!-- Please uncomment the following line if you want to fix this bug -->
-<!-- /assign me -->
+- [ ] Yes, I will open a merge request that closes this ticket.
 
 <!--
 	Please tell us how to fix this bug.
@@ -95,8 +94,3 @@ By submitting this issue, you agree to follow our [Contribution Guidelines](http
 	Many thanks for your involvement!
 -->
 
-
-
-
-<!-- Do not edit the following line -->
-/label Bug?
diff --git a/.gitlab/issue_templates/discussion.md b/.gitlab/issue_templates/discussion.md
index 8ba2022986..fb3129a817 100644
--- a/.gitlab/issue_templates/discussion.md
+++ b/.gitlab/issue_templates/discussion.md
@@ -16,16 +16,16 @@
 <!-- If this happens on your device and has to do with the user interface, it's client-side. If this happens on either with the API or the backend, or you got a server-side error in the client, it's server-side. -->
 
 <!-- Uncomment (remove surrounding arrow signs) the following line(s) to specify the category of this issue. -->
-<!-- /label Server -->
-<!-- /label Client -->
-<!-- /label Mobile -->
-<!-- /label Third-party-client -->
-<!-- /label Docs -->
-<!-- /label Locale -->
-<!-- /label "Build from source" -->
-<!-- /label Container -->
-<!-- /label "Firefish API" -->
-<!-- /label "Mastodon API" -->
+<!-- * Server -->
+<!-- * Client -->
+<!-- * Mobile -->
+<!-- * Third-party-client -->
+<!-- * Docs -->
+<!-- * Locale -->
+<!-- * "Build from source" -->
+<!-- * Container -->
+<!-- * "Firefish API" -->
+<!-- * "Mastodon API" -->
 
 ## What do you think needs to be discussed?
 <!-- Please tell us your idea. -->
@@ -64,8 +64,7 @@ By submitting this issue, you agree to follow our [Contribution Guidelines](http
 - [ ] I have searched the issue tracker for similar issues, and this is not a duplicate.
 
 ## Are you willing to open a merge request? (optional)
-<!-- Please uncomment the following line if you want to implement this yourself -->
-<!-- /assign me -->
+- [ ] Yes, I will open a merge request that closes this ticket.
 
 <!--
 	Please tell us how do you want to implement your idea.
@@ -78,8 +77,3 @@ By submitting this issue, you agree to follow our [Contribution Guidelines](http
 	Many thanks for your involvement!
 -->
 
-
-
-
-<!-- Do not edit the following line -->
-/label Discussion
diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md
index dd3face63e..b9b5c211cc 100644
--- a/.gitlab/issue_templates/feature.md
+++ b/.gitlab/issue_templates/feature.md
@@ -16,16 +16,16 @@
 <!-- If this happens on your device and has to do with the user interface, it's client-side. If this happens on either with the API or the backend, or you got a server-side error in the client, it's server-side. -->
 
 <!-- Uncomment (remove surrounding arrow signs) the following line(s) to specify the category of this issue. -->
-<!-- /label Server -->
-<!-- /label Client -->
-<!-- /label Mobile -->
-<!-- /label Third-party-client -->
-<!-- /label Docs -->
-<!-- /label Locale -->
-<!-- /label "Build from source" -->
-<!-- /label Container -->
-<!-- /label "Firefish API" -->
-<!-- /label "Mastodon API" -->
+<!-- * Server -->
+<!-- * Client -->
+<!-- * Mobile -->
+<!-- * Third-party-client -->
+<!-- * Docs -->
+<!-- * Locale -->
+<!-- * "Build from source" -->
+<!-- * Container -->
+<!-- * "Firefish API" -->
+<!-- * "Mastodon API" -->
 
 ## What feature would you like implemented?
 <!-- Please give us a brief description of what you'd like to be refactored. -->
@@ -49,8 +49,7 @@ By submitting this issue, you agree to follow our [Contribution Guidelines](http
 - [ ] I have searched the issue tracker for similar requests, and this is not a duplicate.
 
 ## Are you willing to implement this feature? (optional)
-<!-- Please uncomment the following line if you want to implement this feature -->
-<!-- /assign me -->
+- [ ] Yes, I will open a merge request that closes this ticket.
 
 <!--
 	Please tell us how to implement this feature.
@@ -63,8 +62,3 @@ By submitting this issue, you agree to follow our [Contribution Guidelines](http
 	Many thanks for your involvement!
 -->
 
-
-
-
-<!-- Do not edit the following line -->
-/label Feature
diff --git a/.gitlab/issue_templates/refactor.md b/.gitlab/issue_templates/refactor.md
index 2c2d6b17a2..6438071e63 100644
--- a/.gitlab/issue_templates/refactor.md
+++ b/.gitlab/issue_templates/refactor.md
@@ -16,16 +16,16 @@
 <!-- If this happens on your device and has to do with the user interface, it's client-side. If this happens on either with the API or the backend, or you got a server-side error in the client, it's server-side. -->
 
 <!-- Uncomment (remove surrounding arrow signs) the following line(s) to specify the category of this issue. -->
-<!-- /label Server -->
-<!-- /label Client -->
-<!-- /label Mobile -->
-<!-- /label Third-party-client -->
-<!-- /label Docs -->
-<!-- /label Locale -->
-<!-- /label "Build from source" -->
-<!-- /label Container -->
-<!-- /label "Firefish API" -->
-<!-- /label "Mastodon API" -->
+<!-- * Server -->
+<!-- * Client -->
+<!-- * Mobile -->
+<!-- * Third-party-client -->
+<!-- * Docs -->
+<!-- * Locale -->
+<!-- * "Build from source" -->
+<!-- * Container -->
+<!-- * "Firefish API" -->
+<!-- * "Mastodon API" -->
 
 ## What parts of the code do you think should be refactored?
 <!-- Please give us a brief description of what you'd like. -->
@@ -49,8 +49,7 @@ By submitting this issue, you agree to follow our [Contribution Guidelines](http
 - [ ] I have searched the issue tracker for similar requests, and this is not a duplicate.
 
 ## Are you willing to refactor the code? (optional)
-<!-- Please uncomment the following line if you want to implement it -->
-<!-- /assign me -->
+- [ ] Yes, I will open a merge request that closes this ticket.
 
 <!--
 	Please tell us how to refactor the code.
@@ -63,8 +62,3 @@ By submitting this issue, you agree to follow our [Contribution Guidelines](http
 	Many thanks for your involvement!
 -->
 
-
-
-
-<!-- Do not edit the following line -->
-/label Refactor