diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000..f46eb8f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,90 @@
+# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
+#
+# Copyright (c) 2024 Composiv.ai, Eteration A.S. and others
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# and Eclipse Distribution License v1.0 which accompany this distribution.
+#
+# The Eclipse Public License is available at
+#    http://www.eclipse.org/legal/epl-v10.html
+# and the Eclipse Distribution License is available at
+#   http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# Contributors:
+#    Composiv.ai, Eteration A.S. - initial API and implementation
+#
+
+
+name: 🐞 Bug Report
+description: Provide a general summary of the bug in the title below.
+title: "[Bug]: "
+labels:
+  - bug
+body:
+  - type: dropdown
+    id: severity
+    validations:
+      required: true
+    attributes:
+      label: Severity
+      description: How severe is the bug in your opinion?
+      multiple: false
+      options:
+        - "Trivial"
+        - "Medium"
+        - "High"
+        - "Critical"
+        - "Blocker"
+  - type: input
+    id: version
+    validations:
+      required: true
+    attributes:
+      label: What release version, tag or commit-hash did you use?
+      description: Please include a link if possible.
+      placeholder: v0.1.0 or 06f432a00e4c66804202c91bdfb9c9b12823928b
+  - type: textarea
+    id: current-behavior
+    validations:
+      required: true
+    attributes:
+      label: Current Behavior
+      description: Tell us what happened instead of the expected behavior.
+      placeholder: Error message appeared when I cloned a repository...
+  - type: textarea
+    id: steps-to-reproduce
+    validations:
+      required: true
+    attributes:
+      label: Steps to Reproduce
+      description: Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant
+      placeholder: |
+        1. ...
+        2. ...
+        3. ...
+  - type: textarea
+    id: expected-behavior
+    validations:
+      required: true
+    attributes:
+      label: Expected Behavior
+      description: Tell us what should happen
+      placeholder: Clone of repository shall be prune of errors.
+  - type: textarea
+    id: possible-solution
+    validations:
+      required: false
+    attributes:
+      label: Possible Solution
+      description: Fix/reason of the bug suggestion
+      placeholder: A possible solution or fix is...
+  - type: textarea
+    id: additional-information
+    validations:
+      required: false
+    attributes:
+      label: Additional Information
+      description: Provide an additional detailed description / screenshots / evidences of the bug
+      placeholder: I would like to add...
+  - type: checkboxes
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000..becbb4f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,56 @@
+# Copyright (c) 2023-2024 Contributors to the Eclipse Foundation
+#
+# Copyright (c) 2024 Composiv.ai, Eteration A.S. and others
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# and Eclipse Distribution License v1.0 which accompany this distribution.
+#
+# The Eclipse Public License is available at
+#    http://www.eclipse.org/legal/epl-v10.html
+# and the Eclipse Distribution License is available at
+#   http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# Contributors:
+#    Composiv.ai, Eteration A.S. - initial API and implementation
+#
+
+
+name: 🛠️ Feature Request
+description: Suggest an idea to help us improve our product.
+title: "[Feature]: "
+labels:
+  - "enhancement"
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description of the feature you're interested in.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Suggested Solution
+      description: |
+        Describe the solution you'd like to be implemented. Provide a clear and concise description of what you want to happen.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Alternatives
+      description: |
+        Describe alternatives you've considered.
+        A clear and concise description of alternative solutions or features you've considered.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: |
+        Add any other context about the problem here.
+    validations:
+      required: false
\ No newline at end of file