diff --git a/.gitea/issue_template/add_package.md b/.gitea/issue_template/add_package.md
new file mode 100644
index 0000000..64e8984
--- /dev/null
+++ b/.gitea/issue_template/add_package.md
@@ -0,0 +1,19 @@
+---
+
+name: "Add a package to Leap 16.0 and Package Hub"
+about: "If you want to add a new package to Leap 16.0 and Package Hub"
+title: "[ADD] <package name>"
+ref: "leap-16.0"
+assignees: []
+labels: 
+
+- new_package
+
+---
+
+This is where you add a new package to Leap-16.0 and Package Hub Please replace and specify on one line. You can include any relevant Bugzilla links too.
+
+org/package#commit_hash
+
+Where the `commit_hash` could be a branch.
+
diff --git a/.gitea/issue_template/rm_package.md b/.gitea/issue_template/rm_package.md
new file mode 100644
index 0000000..df363c6
--- /dev/null
+++ b/.gitea/issue_template/rm_package.md
@@ -0,0 +1,16 @@
+---
+
+name: "Remove package from Leap 16.0 and Package Hub"
+about: "If you want to remove a package from Leap 16.0 and Package Hub"
+title: "[RM] <package name>"
+ref: "leap-16.0"
+assignees: []
+labels: 
+
+- rm_package
+
+---
+
+This is where you rm a package from Leap 16.0 and Package Hub. Please specify package in title and target the correct branch of the project.
+
+