diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000..329eb2c7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,40 @@
+name: "\U0001FAB2 Bug Report"
+description: Submit a bug report to help us improve PR-Agent
+labels: ["bug"]
+body:
+
+  - type: dropdown
+    id: information-git-provider
+    attributes:
+      label: Git provider
+      description: 'The problem arises when using:'
+      options:
+        - "Github Cloud"
+        - "Github Enterprise"
+        - "Gitlab"
+        - "Bitbucket Cloud"
+        - "Bitbucket Server"
+        - "Azure"
+        - "Other"
+    validations:
+      required: true
+
+  - type: textarea
+    id: system-info
+    attributes:
+      label: System Info
+      description: Please share your system info with us.
+      render: shell
+      placeholder: model used, deployment type (action/app/cli/...), etc...
+    validations:
+      required: true
+
+  - type: textarea
+    id: bug-details
+    attributes:
+      label: Bug details
+      description: Please describe the problem.
+      render: shell
+      placeholder: Describe the problem
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..70588e91
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,10 @@
+blank_issues_enabled: true
+version: 0.1
+contact_links:
+  - name: Discussions
+    url: https://github.com/qodo-ai/pr-agent/discussions
+    about: GitHub Discussions
+
+  - name: Discord community
+    url: https://discord.gg/kG35uSHDBc
+    about: Join our discord community
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 00000000..141ec876
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,21 @@
+name: "\U0001F4A1 Feature request"
+description: Submit a proposal/request for a new PR-Agent feature
+labels: ["feature"]
+body:
+  - type: textarea
+    id: feature-request
+    validations:
+      required: true
+    attributes:
+      label: Feature request
+      description: |
+        Description of the feature proposal.
+
+  - type: textarea
+    id: motivation
+    validations:
+      required: true
+    attributes:
+      label: Motivation
+      description: |
+        Outline the motivation for the proposal.
diff --git a/.github/ISSUE_TEMPLATE/miscellaneous.yml b/.github/ISSUE_TEMPLATE/miscellaneous.yml
new file mode 100644
index 00000000..b05a87ff
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/miscellaneous.yml
@@ -0,0 +1,38 @@
+name: "❔ General Issues"
+description: Submit a general issue
+labels: ["general"]
+body:
+
+  - type: dropdown
+    id: information-git-provider
+    attributes:
+      label: Git provider
+      description: 'Git Provider:'
+      options:
+        - "Github Cloud"
+        - "Github Enterprise"
+        - "Gitlab"
+        - "Bitbucket Cloud"
+        - "Bitbucket Server"
+        - "Azure"
+        - "Other"
+
+  - type: textarea
+    id: system-info
+    attributes:
+      label: System Info
+      description: Please share your system info with us.
+      render: shell
+      placeholder: model used, deployment type (action/app/cli/...), etc...
+    validations:
+      required: false
+
+  - type: textarea
+    id: issues-details
+    attributes:
+      label: Issues details
+      description: Please share the issues details.
+      render: shell
+      placeholder: Describe the issue
+    validations:
+      required: true