diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 0000000..917beaa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,47 @@
+name: Bug Report
+description: Please report issues related to OrgChart add-on here.
+body:
+  - type: textarea
+    id: problem-description
+    attributes:
+      label: Describe the bug
+      description: A clear description of the issue you're experiencing.
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of the expected behavior.
+    validations:
+      required: false
+  - type: textarea
+    id: minimal-reproduction
+    attributes:
+      label: Minimal reproducible example
+      description: If possible, add a concise code snippet that reproduces the issue and describe the steps needed to follow to reproduce it.
+    validations:
+      required: false
+  - type: input
+    id: addon-version
+    attributes:
+      label: Add-on Version
+      description: The version of the add-on on which you're experiencing the issue.   
+    validations:
+      required: true
+  - type: input
+    id: vaadin-version
+    attributes:
+      label: Vaadin Version
+      description: The complete Vaadin version (X.Y.Z) on which the issue is reproducible.     
+    validations:
+      required: true
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: "Any other context/information about the issue can be added here (browser, OS, etc.)." 
+    validations:
+      required: false
+ 
+ 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..3ba13e0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000..fdabff2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,24 @@
+name: Feature Request
+description: Please add feature suggestions related to OrgChart add-on here.
+body:
+  - type: textarea
+    id: feature-proposal
+    attributes:
+      label: Feature proposal
+      description: A concise but detailed description of the feature that you would like to see in the add-on.
+    validations:
+      required: true
+  - type: textarea
+    id: feature-implementation
+    attributes:
+      label: Describe solution expectations
+      description: Do you have an idea/expectations of how it could be implemented? Did you try a possible solution that you want to share? 
+    validations:
+      required: false
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: Add any extra information you think it might be relevant to the request.
+    validations:
+      required: false