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/issue--bug-report.md b/.github/ISSUE_TEMPLATE/issue--bug-report.md
deleted file mode 100644
index ca212fe..0000000
--- a/.github/ISSUE_TEMPLATE/issue--bug-report.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-name: Bug report
-about: Let us know about an unexpected error or incorrect behavior
-labels: bug, new
-
----
-
-<!--
-Welcome,
-
-Thanks for opening an issue. The more information you provide, the easier it is for us to assess the problem, prioritize, assign, develop, then release a fix.
-
-The SAS Viya 4 IaC team
-
--->
-
-### Terraform Version
-
-<!---
-We ask this to be sure you are currently running a supported terraform version from your work environment. 
-
-Run `./files/tools/iac_tooling_version.sh` to show the version, and paste the result between the ``` marks below.
-
-If you are not running the latest version of Terraform we support, please try upgrading because your issue may have already been fixed.
-
-If you're not sure which versions are supported, here's a link : https://github.com/sassoftware/viya4-iac-gcp#terraform to help.
--->
-
-```bash
-...
-```
-
-### Terraform Variable File
-
-<!--
-Paste the relevant parts of your Terraform variables between the ``` marks below.
-
-The relevant parts should come from your `terraform.tfvars` file or equivalent and small snippets of the `*.tf` file/files that seem to be causing the error.
-
-For security reasons, do not copy and paste any sensitive information in this issue, like account information and passwords etc.
--->
-
-```terraform
-...
-```
-
-### Steps to Reproduce
-
-<!--
-Please list the full steps required to reproduce the issue, for example:
-1. `terraform init`
-2. `terraform apply`
--->
-
-### Expected Behavior
-
-<!--
-What should have happened?
--->
-
-### Actual Behavior
-
-<!--
-What actually happened? Here you can include output and information from your terraform run.
--->
-
-```bash
-...
-```
-
-### Additional Context
-
-<!--
-Are there anything atypical about your situation that we should know? For example: Are you passing any unusual command line options or environment variables to opt-in to non-default behavior?
--->
-
-### References
-
-<!--
-Are there any other GitHub issues (open or closed) or Pull Requests that should be linked here? For example:
-
-- #123
-
--->
diff --git a/.github/ISSUE_TEMPLATE/issue--bug-report.yaml b/.github/ISSUE_TEMPLATE/issue--bug-report.yml
similarity index 97%
rename from .github/ISSUE_TEMPLATE/issue--bug-report.yaml
rename to .github/ISSUE_TEMPLATE/issue--bug-report.yml
index c618b88..3680b40 100644
--- a/.github/ISSUE_TEMPLATE/issue--bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/issue--bug-report.yml
@@ -14,7 +14,7 @@ body:
 
         If you are not running the latest version of Terraform we support, please try upgrading because your issue may have already been fixed.
 
-        If you're not sure which versions are supported, here's a link : https://github.com/sassoftware/viya4-iac-aws#terraform to help.
+        If you're not sure which versions are supported, here's a link : https://github.com/sassoftware/viya4-iac-gcp#terraform to help.
     validations:
       required: false
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/issue--feature-request.yml b/.github/ISSUE_TEMPLATE/issue--feature-request.yml
new file mode 100644
index 0000000..031b954
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue--feature-request.yml
@@ -0,0 +1,44 @@
+name: Feature Request
+description: |
+  Welcome, Thanks for opening a feature request. The more information you provide, the easier it is for us to assess your request, prioritize, assign, develop, and release. The SAS Viya 4 IaC team.
+labels: [enhancement, new]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: |
+        A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      description: |
+        A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: |
+        A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
+  - type: checkboxes
+    id: tf_terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/sassoftware/viya4-iac-gcp/blob/main/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true