diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yaml b/.github/ISSUE_TEMPLATE/1-bug-report.yaml
new file mode 100644
index 0000000..5df5627
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.yaml
@@ -0,0 +1,93 @@
+name: Bug Report
+description: Report a bug in the ngx-cookie-service
+
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to Reproduce
+    validations:
+      required: true
+      placeholder: |
+        Steps to reproduce the behavior:
+        Go to '...'
+        Click on '....'
+        Scroll down to '....'
+        See error
+  - type: input
+    id: reproduction-link
+    attributes:
+      label: Please provide a link to a minimal reproduction of the bug. StackBlitz, CodePen or CodeSanBox
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected behaviour
+    validations:
+      required: true
+      
+  - type: input
+    id: library-version
+    attributes:
+      label: What version of the library you see this issue?
+    validations:
+      required: true
+
+  - type: dropdown
+    id: angular-version
+    attributes:
+      label: What version of Angular are you using?
+      options:
+        - Angular 12
+        - Angular 11
+        - Angular 10
+        - Angular 9
+        - Angular 8
+        - Angular 7
+        - Angular 6
+        - Angular 4
+        - Angular 2
+      multiple: true
+    validations:
+      required: true
+
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      placeholder: |
+        If applicable, add screenshots to help explain your problem.
+
+
+  - type: textarea
+    id: desktop
+    attributes:
+      label: Desktop? Please complete the following information
+      placeholder: |
+        OS: [e.g. macOS Big Sur, Windows 10]
+        Browser [e.g. Google Chrome, Mozilla Firefox, Micro Soft Edge, Safari]
+        Version [e.g. 92]
+
+
+  - type: textarea
+    id: mobile
+    attributes:
+      label: Mobile? Please complete the following information
+      placeholder: |
+        Device: [e.g. iPhone 12 Pro, Google Pixel 5]
+        OS: [e.g. iOS]
+        Browser [e.g. Google Chrome, Mozilla Firefox, Micro Soft Edge, Safari]
+        Version [e.g. 91]
+        
+  - type: textarea
+    id: other
+    attributes:
+      label: Anything else?
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.yaml b/.github/ISSUE_TEMPLATE/2-feature-request.yaml
new file mode 100644
index 0000000..dec6a5b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-feature-request.yaml
@@ -0,0 +1,35 @@
+name: 'Feature Request'
+description: Suggest a feature for Ngx Cookie Service library
+
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Is your feature request related to a problem? Please describe
+      placeholder: |
+        A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposed-solution
+    attributes:
+      label: Describe the solution you'd like
+      placeholder: |
+        A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives-considered
+    attributes:
+      label: Describe alternatives you've considered
+      placeholder: |
+        A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: true
+ 
+  - type: textarea
+    id: other
+    attributes:
+      label: Additional context
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index eb20abc..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
----
-
-## Describe the bug
-A clear and concise description of what the bug is.
-
-## To Reproduce
-
-Steps to reproduce the behavior:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-## Expected behavior
-
-A clear and concise description of what you expected to happen.
-
-## Please provide the Angular you discovered this bug in
- - Angular Version:
- - Angular CLI Version: 
-
-## Screenshots**
-
-If applicable, add screenshots to help explain your problem.
-
-## Desktop (please complete the following information):
-- OS: [e.g. iOS]
-- Browser [e.g. chrome, safari]
-- Version [e.g. 22]
-
-## Smartphone (please complete the following information):
-
-- Device: [e.g. iPhone6]
-- OS: [e.g. iOS8.1]
-- Browser [e.g. stock browser, safari]
-- Version [e.g. 22]
-
-## Additional context
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 2f28cea..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.