diff --git a/.github/ISSUE_TEMPLATE/01_BUG_REPORT.md b/.github/ISSUE_TEMPLATE/01_BUG_REPORT.md
new file mode 100644
index 00000000..9207a18e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01_BUG_REPORT.md
@@ -0,0 +1,42 @@
+---
+name: Bug Report
+about: Report a bug or unexpected behavior in the YDB Rust SDK
+title: "bug: "
+labels: "bug"
+assignees: ""
+
+---
+
+# Bug Report
+
+**Describe the bug**
+
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to: 
+
+<!-- Insert short instruction here. -->
+
+2. Run code: 
+
+<!-- Insert short code snippets here. -->
+
+3. See error:
+
+<!-- If applicable, add error logs or screenshots to help explain your problem. -->
+
+**Expected behavior:**
+
+<!-- Describe what the behavior would be without the bug. --> 
+
+**Environment (please complete the following information):**
+ - OS: <!-- description -->
+ - Rust version: <!-- version -->
+ - SDK version: <!-- version -->
+ - YDB Server version (if known): <!-- version -->
+
+**Additional context**
+
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md
new file mode 100644
index 00000000..5b1fbd1b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md
@@ -0,0 +1,40 @@
+---
+name: Feature Request
+about: Suggest an idea or feature for the YDB Rust SDK
+title: "feat: "
+labels: "enhancement"
+assignees: ""
+
+---
+# Feature Request
+
+**Describe the Feature Request**
+
+<!-- A clear and concise description of what the feature request is. Please include if your feature request is related to a problem. -->
+
+**Describe Preferred Solution**
+
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe Alternatives**
+
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Related Code**
+
+<!-- If you are able to illustrate the bug or feature request with an example, please provide it here. -->
+
+**Additional Context**
+
+<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to add, use case, Stack Overflow links, forum links, screenshots, OS if applicable, etc. -->
+
+**If the feature request is approved, would you be willing to submit a PR?**
+
+- [ ] Yes
+- [ ] No
+
+_(Help can be provided if you need assistance submitting a PR)_
+
+**Potential Impact**
+
+<!-- Describe how this feature might impact existing functionality or users. -->
diff --git a/.github/ISSUE_TEMPLATE/03_CODEBASE_IMPROVEMENT.md b/.github/ISSUE_TEMPLATE/03_CODEBASE_IMPROVEMENT.md
new file mode 100644
index 00000000..8b4f8e34
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/03_CODEBASE_IMPROVEMENT.md
@@ -0,0 +1,28 @@
+---
+name: Codebase Improvement
+about: Suggest improvements to code quality, architecture, or documentation
+title: "dev: "
+labels: "improvement"
+assignees: ""
+
+---
+
+**Impact Assessment**
+
+How would this change affect:
+- [ ] Performance
+- [ ] Maintainability
+- [ ] Backward compatibility
+- [ ] User experience
+
+**Area of Improvement**
+
+<!-- What part of the codebase would you like to see improved? (e.g., documentation, error handling, performance, architecture). -->
+
+**Current Situation**
+
+<!-- Describe the current implementation or behavior. -->
+
+**Suggested Improvement**
+
+<!-- Describe your proposed improvement and why it would be beneficial. Results of tracing or performance tests. -->
diff --git a/Cargo.lock b/Cargo.lock
index dff71e7b..476f4614 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2919,7 +2919,7 @@ dependencies = [
 
 [[package]]
 name = "ydb"
-version = "0.9.4"
+version = "0.9.5"
 dependencies = [
  "async-trait",
  "async_once",