diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 00000000..09b08917
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,39 @@
+name: feature.md
+description: Submit a proposal for a new feature
+title: '[Feature]: '
+labels: [':rocket: Feature Request']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ### Thank you for taking the time to suggest a new feature!
+        We kindly ask that you search to see if an issue [already exists](https://github.com/razorpay/razorpay-java/issues?q=is%3Aissue+sort%3Acreated-desc+) for your feature.
+        We are also happy to accept contributions from our users.
+  - type: textarea
+    id: description
+    attributes:
+      label: '🚀 Feature Proposal'
+      description: 
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Suggested Solution
+      description: 
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives
+      description:
+    validations:
+      required: false
+  - type: textarea
+    id: extra
+    attributes:
+      label: Additional Information
+      description:
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/issue_report.yml b/.github/ISSUE_TEMPLATE/issue_report.yml
new file mode 100644
index 00000000..aaab805f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue_report.yml
@@ -0,0 +1,63 @@
+name: Issue report
+description: Create a report to help us improve
+labels: ["issue"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this issue report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Describe the Issue
+      description: A clear and concise description of what the issue is.
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: repro-steps
+    attributes:
+      label: Steps to reproduce the behavior
+      description: 
+      placeholder: |
+        1. Fetch a '...'
+        2. Update the '....'
+        3. See error
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: code-snippets
+    attributes:
+      label: Code snippets
+      description: If applicable, add code snippets to help explain your problem.
+      render: Java
+    validations:
+      required: false
+  - type: input
+    id: language-version
+    attributes:
+      label: Java version
+      placeholder: Java v1.8
+    validations:
+      required: true
+  - type: input
+    id: lib-version
+    attributes:
+      label: Library version
+      placeholder: razorpay-java v1.4.3
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
+    validations:
+      required: false