diff --git a/.gitea/ISSUE_TEMPLATE/bug.yaml b/.gitea/ISSUE_TEMPLATE/bug.yaml
index 5d2ac42..fcdbb29 100644
--- a/.gitea/ISSUE_TEMPLATE/bug.yaml
+++ b/.gitea/ISSUE_TEMPLATE/bug.yaml
@@ -2,10 +2,19 @@ name: Bug Report
 about: File a bug report
 title: "[BUG]: "
 body:
+  - type: dropdown
+    id: build_type
+    attributes:
+      label: "Build type (`docker-finance build`)"
+      options:
+        - default
+        - slim
+        - tiny
+        - micro
   - type: dropdown
     id: version
     attributes:
-      label: "Version or master (branch)"
+      label: "Release version or master (branch)"
       options:
         - master (branch)
         - v1.0.0-beta
diff --git a/.gitea/PULL_REQUEST_TEMPLATE.yaml b/.gitea/PULL_REQUEST_TEMPLATE.yaml
new file mode 100644
index 0000000..8589995
--- /dev/null
+++ b/.gitea/PULL_REQUEST_TEMPLATE.yaml
@@ -0,0 +1,17 @@
+name: Pull Request
+about: Open a pull request
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: "Description"
+      placeholder: "What's the nature of this pull request?"
+    validations:
+      required: false
+  - type: checkboxes
+    id: agreement
+    attributes:
+      label: "Agreement"
+      options:
+        - label: I have read and understood the [Development](https://gitea.com/EvergreenCrypto/docker-finance#development) and [License](https://gitea.com/EvergreenCrypto/docker-finance#license-and-disclaimer) documentation
+          required: true