diff --git a/.github/ISSUE_TEMPLATE/opensrp-web-fhir.yml b/.github/ISSUE_TEMPLATE/opensrp-1-web-support.yml
similarity index 73%
rename from .github/ISSUE_TEMPLATE/opensrp-web-fhir.yml
rename to .github/ISSUE_TEMPLATE/opensrp-1-web-support.yml
index 4c3657256..3e0f47457 100644
--- a/.github/ISSUE_TEMPLATE/opensrp-web-fhir.yml
+++ b/.github/ISSUE_TEMPLATE/opensrp-1-web-support.yml
@@ -1,12 +1,12 @@
-name: General OpenSRP web FHIR.
-description: Use this to Create issues the are FHIR related.
-title: '[FHIR Road Map]: '
-labels: [FHIR compatibility]
+name: OpenSRP 1 web Support Request.
+description: Use this to Create issues related to OpenSRP 1 (None FHIR Version).
+title: '[OpenSRP 1 Support]: '
+labels: [OpenSRP 1 Support]
 body:
  - type: markdown
    attributes:
      value: |
-       Thanks for taking the time to fill out this bug report!
+       Thanks for taking the time to fill out this support request!
  - type: textarea
    id: issue_context
    attributes:
@@ -20,7 +20,7 @@ body:
      label: Issue Implemetation details?
      description: Please write up the implementation details of the issue/feature.
    validations:
-     required: true
+     required: false
  - type: textarea
    id: issue_acceptance
    attributes:
@@ -28,11 +28,12 @@ body:
      description: Please provide an acceptance criteria on the issue/feature?.
    validations:
      required: true
- - type: textarea
-   id: issue_fhir_resources
+ - type: input
+   id: project_contact
    attributes:
-     label: FHIR resources to be used?
-     description: Please provide a list of FHIR resources to be used for this issue/feature.
+     label: Project Contact
+     description: Who is the technical lead on this project?
+     placeholder: John Doe
    validations:
      required: false
  - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/opensrp-web-bug-report.yml b/.github/ISSUE_TEMPLATE/opensrp-web-bug-report.yml
index 5fdf69a4e..9bde9fc2a 100644
--- a/.github/ISSUE_TEMPLATE/opensrp-web-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/opensrp-web-bug-report.yml
@@ -1,4 +1,4 @@
-name: General OpenSRP web Bug Report.
+name: OpenSRP web Bug Report.
 description: Use this to Report a bug experienced on an OpenSRP web instance.
 title: '[Bug Report]: '
 labels: [Bug Report]
diff --git a/.github/ISSUE_TEMPLATE/opensrp-web-new-feature-request.yml b/.github/ISSUE_TEMPLATE/opensrp-web-new-feature-request.yml
index 4edb73be5..102fc2fb9 100644
--- a/.github/ISSUE_TEMPLATE/opensrp-web-new-feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/opensrp-web-new-feature-request.yml
@@ -1,7 +1,7 @@
-name: OpenSRP web new Feature request.
-description: Use this to request for a new feature that is not available in the current application.
-title: '[New Feature Request]: '
-labels: [New Feature Request]
+name: OpenSRP web Enhancement/Feature request.
+description: Use this to request for an enhancement or new feature that is not available in the current application.
+title: '[Enhancement/Feature Request]: '
+labels: [Feature Request]
 body:
  - type: markdown
    attributes:
@@ -10,9 +10,9 @@ body:
  - type: textarea
    id: use_case
    attributes:
-     label: Feature Use Case
+     label: Use case/Problem Statement
      description: Give a detailed use case of how this feature is to be used?
-     placeholder: Needed to dispaly what teams practitioners are assigned to
+     placeholder: Needed to display what teams practitioners are assigned to
    validations:
      required: true
  - type: textarea