diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 0ea846206f94..e136781f1b09 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -38,3 +38,26 @@ body:
       description: Include FerretDB logs if possible.
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+          - **OS**: Ubuntu 20.04
+          - **Architecture**: x86_64
+          - **Version**: v0.7.0
+          - **Go version**: 1.19.3
+          - **Git version**: 2.37.1
+          - **Deployment**: Docker
+          - **Deployment details**: Docker version 20.10.8 Compose version 1.29.2
+      value: |
+        - OS:
+        - Architecture:
+        - Version:
+        - Go:
+        - Git:
+        - Deployment:
+        - Deployment details:
+      render: markdown
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/chore.yml b/.github/ISSUE_TEMPLATE/chore.yml
index a883deacaa5d..82963dffef3f 100644
--- a/.github/ISSUE_TEMPLATE/chore.yml
+++ b/.github/ISSUE_TEMPLATE/chore.yml
@@ -14,10 +14,23 @@ body:
     id: what
     attributes:
       label: What should be done?
-    validations:
-      required: true
+      description: Additional context you would like to provide.
   - type: textarea
     id: where
     attributes:
       label: Where?
       description: Include a permalink if possible.
+  - type: textarea
+    id: dod
+    attributes:
+      label: Definition of Done
+      description: What should be done to consider this issue done?
+      value: |
+        - [ ] unit tests added
+        - [ ] integration tests added
+        - [ ] compatibility tests added
+        - [ ] spot refactoring done
+        - [ ] documentation updated
+        - [ ] anything else?
+    validations:
+      required: true
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a43566d218d5..0af8f88c098d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,7 +16,11 @@ Closes #{issue_number}.
     please follow CONTRIBUTING.md.
 -->
 
-* [ ] I added tests for new functionality or bugfixes.
+* [ ] I added unit tests for new functionality or bugfixes.
+* [ ] I added integration tests for new functionality or bugfixes.
+* [ ] I added compatibility tests for new functionality or bugfixes.
+* [ ] I made spot refactoring.
+* [ ] I updated the documentation.
 * [ ] I ran `task all`, and it passed.
 * [ ] I added/updated comments for both exported and unexported top-level declarations (functions, types, etc).
 * [ ] I checked comments rendering with `task godocs`.