diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
index 31e6af0f..796f1144 100644
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,20 +1,54 @@
-Detailed description of the issue. Put as much information as you can, potentially
-with images showing the issue.
+<!-- 
+Please read https://wiki.gnome.org/Community/GettingInTouch/BugReportingGuidelines
+first to ensure that you create a clear and specific issue.
+-->
 
-Steps to reproduce:
+### Affected version
 
-1. Open GNOME Calendar
-2. Create an event
+<!--
+Provide at least the following information:
+* Your OS and version
+* Affected GNOME Calendar version
+-->
+
+### Bug summary
+
+<!-- 
+Provide a short summary of the bug you encountered.
+-->
+
+### Steps to reproduce
+
+<!-- 
+1. Step one
+2. Step two
 3. ...
+-->
 
-## Design Tasks
+### What happened
 
-* [ ]  design tasks
+<!-- 
+What did GNOME Calendar do that was unexpected?
+-->
 
-## Development Tasks
+### What did you expect to happen
 
-* [ ]  development tasks
+<!-- 
+What did you expect GNOME Calendar to do?
+-->
 
-## QA Tasks
+### Relevant logs, screenshots, screencasts etc.
 
-* [ ]  qa (quality assurance) tasks
+<!-- 
+If you have further information, such as technical documentation, logs,
+screenshots or screencasts related, please provide them here.
+
+If the bug is a crash, please obtain a stack trace with installed debug
+symbols (at least for GNOME Calendar) and attach it to
+this issue following the instructions on
+https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces.
+-->
+
+
+<!-- Do not remove the following line. -->
+/label ~"1. Bug"
diff --git a/.gitlab/issue_templates/Epic.md b/.gitlab/issue_templates/Epic.md
deleted file mode 100644
index aa7c6a3b..00000000
--- a/.gitlab/issue_templates/Epic.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Current problems
-<!--
-What are the problems that the current project has?
-
-For example:
-* User cannot use the keyboard to perform most common actions
-or
-* User cannot see documents from cloud services
--->
-
-# Goals & use cases
-<!--
-What are the use cases that this proposal will cover? What are the end goals?
-
-For example:
-* User needs to share a file with their friends.
-or
-* It should be easy to edit a picture within the app.
--->
-
-# Requirements
-<!--
-What does the solution needs to ensure for being succesful?
-
-For example:
-* Work on small form factors and touch
-or
-* Use the Meson build system and integrate with it
--->
-
-# Relevant art
-<!--
-Is there any product that has implemented something similar? Put links to other
-projects, pictures, links to other code, etc.
--->
-
-# Proposal & plan
-<!-- What's the solution and how should be achieved? It can be split in smaller
-tasks of minimum change, so they can be delivered across several releases. -->
-
-/label ~"1. Epic"
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
index d7648665..b763cb3e 100644
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
@@ -1,17 +1,30 @@
-Detailed description of the feature. Put as much information as you can.
+<!-- 
+Please read https://wiki.gnome.org/Community/GettingInTouch/BugReportingGuidelines
+first to ensure that you create a clear and specific issue.
+-->
 
-Proposed Mockups:
+### Feature summary
 
-(Add mockups of the proposed feature)
+<!-- 
+Describe what you would like to be able to do with GNOME Calendar
+that you currently cannot do.
+-->
 
-## Design Tasks
+### How would you like it to work
 
-* [ ]  design tasks
+<!-- 
+If you can think of a way GNOME Calendar might be able to do this,
+let us know here.
+-->
 
-## Development Tasks
+### Relevant links, screenshots, screencasts etc.
 
-* [ ]  development tasks
+<!-- 
+If you have further information, such as technical documentation,
+code, mockups or a similar feature in another desktop environments,
+please provide them here.
+-->
 
-## QA Tasks
 
-* [ ]  qa (quality assurance) tasks
+<!-- Do not remove the following line. -->
+/label ~"1. Feature"