diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 960f91b..478b122 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -39,11 +39,10 @@ Check that there is not already provided the described functionality
 
 ### Environment
 
-- The release version/s you are using: 
-- OS: 
-- Ansible Version: 
-- Python Version:
+- The release version/s you are using:
+- OS:
 - Others:
+
 ### Additional Information
 
 [Any additional information, configuration or data that might be necessary to reproduce the issue.]
diff --git a/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE.md b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index a1350f5..0000000
--- a/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,32 +0,0 @@
-
-### Prerequisites
-
-* [ ] Put an X between the brackets on this line if you have done all of the following:
-    * Read [Idealista's Code of Conduct](https://github.com/idealista/{{ cookiecutter.app_name }}_role/blob/main/.github/CODE_OF_CONDUCT.md) and plan to comply with it 
-    * Checked that your issue isn't already filled: [issues](https://github.com/idealista/{{ cookiecutter.app_name }}_role/issues)
-    * Checked that there is not already provided the described functionality
-
-### Description
-<!-- Description of the issue -->
-
-
-### Steps to Reproduce
-
-1. [First Step]
-2. [Second Step]
-3. [and so on...]
-
-**Expected behavior:**
-<!-- What you expect to happen -->
-
-**Actual behavior:**
-<!-- What actually happens -->
-
-**Reproduces how often:**
-<!-- What percentage of the time does it reproduce? -->
-### Versions
-<!-- The version/s you notice the behavior. -->
-
-
-### Additional Information
-<!-- Any additional information, configuration or data that might be necessary to reproduce the issue. -->
diff --git a/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/bug_report.md b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..960f91b
--- /dev/null
+++ b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,49 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+<!--
+PREREQUISITES
+
+Have you read Idealista's Code of Conduct? By filling an Issue, you are expected to comply with it,
+ including treating everyone with respect: https://github.com/idealista/idealista/blob/master/CODE_OF_CONDUCT.md
+
+Check that your issue isn't already filled: https://github.com/issues?utf8=✓&q=is%3Aissue+user%3Aidealista
+
+Check that there is not already provided the described functionality
+-->
+
+### Description
+
+[Description of the issue]
+
+### Steps to Reproduce
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior:**
+[What you expect to happen]
+
+**Actual behavior:**
+[What actually happens]
+
+**Reproduces how often:** 
+[What percentage of the time does it reproduce?]
+
+### Environment
+
+- The release version/s you are using: 
+- OS: 
+- Ansible Version: 
+- Python Version:
+- Others:
+### Additional Information
+
+[Any additional information, configuration or data that might be necessary to reproduce the issue.]
diff --git a/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/config.yml b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..3ba13e0
--- /dev/null
+++ b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/feature_request.md b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..9b2e2d9
--- /dev/null
+++ b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,31 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: enhancement
+assignees: ''
+
+---
+
+<!--
+PREREQUISITES
+
+Have you read Idealista's Code of Conduct? By filling an Issue, you are expected to comply with it,
+ including treating everyone with respect: https://github.com/idealista/idealista/blob/master/CODE_OF_CONDUCT.md
+
+Check that your issue isn't already filled: https://github.com/issues?utf8=✓&q=is%3Aissue+user%3Aidealista
+
+Check that there is not already provided the described functionality
+-->
+
+### Description
+
+[Description of the issue]
+
+### Why is this needed?
+
+[A clear and concise description of why do you think this is needed]
+
+### Additional Information
+
+[Any additional information, configuration or data.]
diff --git a/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/refactor.md b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/refactor.md
new file mode 100644
index 0000000..8d7bff6
--- /dev/null
+++ b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/refactor.md
@@ -0,0 +1,27 @@
+---
+name: Refactor
+about: Found anything to refactor in this project?
+title: "[REFACTOR]"
+labels: clean-up
+assignees: ''
+
+---
+
+<!--
+PREREQUISITES
+
+Have you read Idealista's Code of Conduct? By filling an Issue, you are expected to comply with it,
+ including treating everyone with respect: https://github.com/idealista/idealista/blob/master/CODE_OF_CONDUCT.md
+
+Check that your issue isn't already filled: https://github.com/issues?utf8=✓&q=is%3Aissue+user%3Aidealista
+
+Check that there is not already provided the described functionality
+-->
+
+### Description
+
+[Description of the issue]
+
+### Link/s to the specific code that needs a refactor (if applicable)
+
+[Links]
\ No newline at end of file
diff --git a/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/support_request.md b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/support_request.md
new file mode 100644
index 0000000..a5a9e07
--- /dev/null
+++ b/{{cookiecutter.app_name}}_role/.github/ISSUE_TEMPLATE/support_request.md
@@ -0,0 +1,27 @@
+---
+name: Support Request
+about: Support request or question about this project
+title: "[SUPPORT]"
+labels: question
+assignees: ''
+
+---
+
+<!--
+PREREQUISITES
+
+Have you read Idealista's Code of Conduct? By filling an Issue, you are expected to comply with it,
+ including treating everyone with respect: https://github.com/idealista/idealista/blob/master/CODE_OF_CONDUCT.md
+
+Check that your issue isn't already filled: https://github.com/issues?utf8=✓&q=is%3Aissue+user%3Aidealista
+
+Check that there is not already provided the described functionality
+-->
+
+### Description
+
+[Description of the issue]
+
+### Additional Information
+
+Any additional information, configuration or data that might be necessary to reproduce the issue.
\ No newline at end of file
diff --git a/{{cookiecutter.app_name}}_role/.github/PULL_REQUEST_TEMPLATE.md b/{{cookiecutter.app_name}}_role/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 2eb9c29..0000000
--- a/{{cookiecutter.app_name}}_role/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,26 +0,0 @@
-### Requirements
-
-* Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
-* All new code requires tests to ensure against regressions
-* Remember to set **idealista:develop** as base branch;
-
-### Description of the Change
-
-<!--
-
-We must be able to understand the design of your change from this description. If we can't get a good idea of what the code will be doing from the description here, the pull request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code here recently, so please walk us through the concepts.
-
--->
-
-
-### Benefits
-
-<!-- What benefits will be realized by the code change? -->
-
-### Possible Drawbacks
-
-<!-- What are the possible side-effects or negative impacts of the code change? -->
-
-### Applicable Issues
-
-<!-- Enter any applicable Issues here -->
\ No newline at end of file