diff --git a/.gitea/issue_template/001-abra-bug.md b/.gitea/issue_template/001-abra-bug.md
deleted file mode 100644
index 03903c5..0000000
--- a/.gitea/issue_template/001-abra-bug.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: "🐛 Abra bug report"
-about: "Use this template For raising bugs against Abra"
-title: ""
-labels:
-  - bug
-  - abra
----
-
-<!-- please include your abra version ("abra -v") -->
diff --git a/.gitea/issue_template/001-bug.md b/.gitea/issue_template/001-bug.md
new file mode 100644
index 0000000..927358b
--- /dev/null
+++ b/.gitea/issue_template/001-bug.md
@@ -0,0 +1,7 @@
+---
+name: "🐛 Bug report"
+about: "For all kinds of bugs against abra, docs, catalogue, etc."
+title: ""
+labels:
+  - bug
+---
diff --git a/.gitea/issue_template/002-abra-feat.md b/.gitea/issue_template/002-abra-feat.md
deleted file mode 100644
index 0d39a78..0000000
--- a/.gitea/issue_template/002-abra-feat.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: "✨ Abra feature request"
-about: "Use this template for requesting new features for Abra"
-title: ""
-labels:
-  - enhancement
-  - abra
----
diff --git a/.gitea/issue_template/002-feat.md b/.gitea/issue_template/002-feat.md
new file mode 100644
index 0000000..690233b
--- /dev/null
+++ b/.gitea/issue_template/002-feat.md
@@ -0,0 +1,7 @@
+---
+name: "✨ Feature request"
+about: "Share ideas for new features and functionality"
+title: ""
+labels:
+  - enhancement
+---
diff --git a/.gitea/issue_template/003-docs.md b/.gitea/issue_template/003-docs.md
deleted file mode 100644
index 5fd3a3f..0000000
--- a/.gitea/issue_template/003-docs.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: "📝 Documentation issue"
-about: "Use this template for documentation-related issues"
-title: ""
-labels:
-  - documentation
----
diff --git a/.gitea/issue_template/003-prop.md b/.gitea/issue_template/003-prop.md
new file mode 100644
index 0000000..55cfe6c
--- /dev/null
+++ b/.gitea/issue_template/003-prop.md
@@ -0,0 +1,6 @@
+---
+name: "🤓 Proposal"
+about: "For large changes that require input and decision making"
+title: ""
+labels:
+---
diff --git a/.gitea/issue_template/004-install.md b/.gitea/issue_template/004-install.md
deleted file mode 100644
index 85a611f..0000000
--- a/.gitea/issue_template/004-install.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: "🚀 Installation issue"
-about: "Use this template for build/installation issues"
-title: ""
-labels:
-  - bug
-  - installer
----
-
-<!-- please include OS info! -->