diff --git a/.gitea/issue_template/bug-issue.md b/.gitea/issue_template/bug-issue.md
deleted file mode 100644
index cea7eec..0000000
--- a/.gitea/issue_template/bug-issue.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-name: "Story"
-about: "A bug report"
-title: "[Bug] "
-ref: "develop"
-labels:
-
-- type: bug
-
----
-
-*...Provide a general summary of the issue in the Title above*
-
-## Expected Behavior
-
-*...Tell us what should happen*
-
-## Current Behavior
-
-*...Tell us what happens instead of the expected behavior*
-
-## Possible Solution
-
-*...Not obligatory, but suggest a fix/reason for the bug*
-
-## Steps to Reproduce
-
-*...Provide a link to a live example, or an unambiguous set of steps to reproduce this bug.
-Include code to reproduce, if relevant*
-
-1.
-2.
-3.
-4.
-
-## Context (Environment)
-
-*...How has this issue affected you? What are you trying to accomplish? Providing context helps us
-come up with a solution that is most useful in the real world*
-
-## Detailed Description
-
-*...Provide a detailed description of the change or addition you are proposing*
-
-## Possible Implementation
-
-*...Not obligatory, but suggest an idea for implementing addition or change*
diff --git a/.gitea/issue_template/bug.md b/.gitea/issue_template/bug.md
index 2ed8329..cea7eec 100644
--- a/.gitea/issue_template/bug.md
+++ b/.gitea/issue_template/bug.md
@@ -1,18 +1,47 @@
 ---
-
-name: "Bug Report"
-about: "This template is for a bug report!"
-title: "BUG"
-ref: "main"
+name: "Story"
+about: "A bug report"
+title: "[Bug] "
+ref: "develop"
 labels:
-- bug
+
+- type: bug
 
 ---
 
-# My Bug Report
+*...Provide a general summary of the issue in the Title above*
 
-This is the body of the bug report.
+## Expected Behavior
 
-What have i checked?
-- [ ] Test A...
-- [ ] Test B...
\ No newline at end of file
+*...Tell us what should happen*
+
+## Current Behavior
+
+*...Tell us what happens instead of the expected behavior*
+
+## Possible Solution
+
+*...Not obligatory, but suggest a fix/reason for the bug*
+
+## Steps to Reproduce
+
+*...Provide a link to a live example, or an unambiguous set of steps to reproduce this bug.
+Include code to reproduce, if relevant*
+
+1.
+2.
+3.
+4.
+
+## Context (Environment)
+
+*...How has this issue affected you? What are you trying to accomplish? Providing context helps us
+come up with a solution that is most useful in the real world*
+
+## Detailed Description
+
+*...Provide a detailed description of the change or addition you are proposing*
+
+## Possible Implementation
+
+*...Not obligatory, but suggest an idea for implementing addition or change*
diff --git a/.gitea/issue_template/epic-issue.md b/.gitea/issue_template/epic-issue.md
deleted file mode 100644
index bb6c8ea..0000000
--- a/.gitea/issue_template/epic-issue.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-
-name: "Epic"
-about: "An Epic aggregates multiple issues to a single topic"
-title: "[Epic] "
-ref: "develop"
-labels:
-
-- type: epic
-
----
-
-:clipboard: [Epic description](HERE GOES THE LINK TO THE DOCUMENTATION)
-
-## Todos
-
-- [ ] Name of the issue... #51
-- [ ] ...
diff --git a/.gitea/issue_template/epic.md b/.gitea/issue_template/epic.md
index 9f80cf7..bb6c8ea 100644
--- a/.gitea/issue_template/epic.md
+++ b/.gitea/issue_template/epic.md
@@ -1,17 +1,18 @@
 ---
 
 name: "Epic"
-about: "This template is for an epic!"
+about: "An Epic aggregates multiple issues to a single topic"
 title: "[Epic] "
-ref: "main"
+ref: "develop"
 labels:
 
+- type: epic
+
 ---
 
-# My Epic
+:clipboard: [Epic description](HERE GOES THE LINK TO THE DOCUMENTATION)
 
-This is the body of the Epic report.
+## Todos
 
-What have i checked?
-- [ ] Issue 1...
-- [ ] Issue 2...
\ No newline at end of file
+- [ ] Name of the issue... #51
+- [ ] ...
diff --git a/.gitea/issue_template/story-issue.md b/.gitea/issue_template/story.md
similarity index 100%
rename from .gitea/issue_template/story-issue.md
rename to .gitea/issue_template/story.md