diff --git a/.github/ISSUE_TEMPLATE/01_issueTemplate.yaml b/.github/ISSUE_TEMPLATE/01_issueTemplate.yaml
new file mode 100755
index 000000000..6b65d8e5a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01_issueTemplate.yaml
@@ -0,0 +1,112 @@
+name: Report a Bug
+description: Provide a general summary of the issue found in the Title field below and then complete the remainder of the form.
+labels: ["Type: Bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before you open an issue, please:
+        - check if a similar issue already exists or has been closed before.
+        - if you have discovered a security risk, a security risk, please refer to our [Security Policy](https://docs.suitecrm.com/community/security-policy)
+
+        Issues found in SuiteCRM 7 should be raised [here](https://github.com/salesagility/SuiteCRM/issues/new/choose)
+
+  - type: textarea
+    id: issue
+    attributes:
+      label: Issue
+      description: Provide a detailed description for the issue, why you consider it to be a bug and what you expect should happen
+      placeholder: Ensure that all code ``` is surrounded ``` by triple back quotes. This can also be done over multiple lines.
+    validations:
+      required: true
+  - type: textarea
+    id: possible-fix
+    attributes:
+      label: Possible Fix
+      description: Not obligatory, but suggest a fix or reason for the bug
+    validations:
+      required: false
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to Reproduce the Issue
+      description: Provide a link to a live example or the steps taken to produce this bug including code to reproduce, if relevant
+      value: |
+        1.
+        2.
+        3.
+        ...
+      render: bash
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Context
+      description: We appreciate it if you could give us more context - how has this bug affected you? What were you trying to accomplish?
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value:
+        "## "
+  - type: markdown
+    attributes:
+      value:
+        "## Your Environment:"
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of SuiteCRM are you running?
+      placeholder: ex. 8.6.0
+    validations:
+      required: true
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: What browser are you currently using?
+      options:
+        - Chrome
+        - Firefox
+        - Safari
+        - Microsoft Edge
+        - Other
+      default: 0
+    validations:
+      required: true
+  - type: input
+    id: browser-version
+    attributes:
+      label: Browser Version
+      description: We would like you to be a little bit more specific.
+      placeholder: ex. Chrome Version 122.0.6261.57/58 (64-bit)
+    validations:
+      required: false
+  - type: input
+    id: environment
+    attributes:
+      label: Environment Information
+      placeholder: ex. MySQL, PHP 8.2
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating System and Version
+      placeholder: ex. Ubuntu 23.10
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        > **Remember to support your issue by voting!**
+        Get more information [here](https://docs.suitecrm.com/community/raising-issues/issues-voting/)
+  - type: markdown
+    attributes:
+      value:
+        "## "
+  - type: markdown
+    attributes:
+      value:
+        "## Thank you for bringing this issue to our attention!"
diff --git a/.github/ISSUE_TEMPLATE/02_missingFeatureTemplate.yaml b/.github/ISSUE_TEMPLATE/02_missingFeatureTemplate.yaml
new file mode 100755
index 000000000..26ef972e7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02_missingFeatureTemplate.yaml
@@ -0,0 +1,42 @@
+name: Report a Missing Feature
+description: We would like you to inform us what features from the SuiteCRM 7 are missing in the SuiteCRM 8
+labels: ["Type:Missing Feature"]
+body:
+  - type: markdown
+    attributes:
+      value:
+        "## "
+  - type: markdown
+    attributes:
+      value:
+        "## Thanks in advance for your time filling out the form!"
+  - type: markdown
+    attributes:
+      value: |
+        Before you open an issue, please:
+        - check if this missing feature has already been reported or has been closed before.
+
+        If instead you want to suggest new features/enhancements, please use the community forums [Suggestion Box](https://community.suitecrm.com/c/suggestion-box/)
+
+  - type: textarea
+    id: feature
+    attributes:
+      label: Feature
+      description: Provide a detailed description of the feature present in SuiteCRM 7 that you are missing in SuiteCRM 8
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value:
+        "## "
+  - type: markdown
+    attributes:
+      value:
+        "## Thank you for the feature request!"
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100755
index 000000000..90cee2315
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Request a Feature/Suggestion/Enhancement
+    url: https://community.suitecrm.com/c/suggestion-box/13
+    about: If you would like to request an enhancement/feature, please do so via the forum, as this allows community members to vote for the suggestions more easily
+  - name: Raise a Documentation Issue
+    url: https://github.com/salesagility/SuiteDocs/issues/new
+    about: Please use this item if you would like to report a documentation issue
+  - name: Raise a SuiteCRM 7 Bug
+    url: https://github.com/salesagility/SuiteCRM/issues/new/choose
+    about: Please use this item if your issue was identified on SuiteCRM 7
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
old mode 100644
new mode 100755
index eabe471e4..a5a030654
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -6,4 +6,6 @@ For a list of supported versions, please see the documentation [Supported Versio
 
 ## Reporting a Vulnerability
 
+To report a security issue, please use the GitHub Security Advisory ["Report a Vulnerability"](https://github.com/salesagility/SuiteCRM-Core/security/advisories/new) tab.
+
 For details on how to report a vulnerability please check our [Security Policy](https://docs.suitecrm.com/community/security-policy/) page. 
diff --git a/.github/workflows/add-comment.yml b/.github/workflows/add-comment.yml
new file mode 100644
index 000000000..d6c58b5b5
--- /dev/null
+++ b/.github/workflows/add-comment.yml
@@ -0,0 +1,25 @@
+name: Add comment
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment:
+    if: contains(github.event.label.name, 'Bug')
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: Add comment
+        run: gh issue comment "$NUMBER" --body "$BODY"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          BODY: |
+            Hey @${{ github.actor }}!
+            Thanks for contributing to the SuiteCRM project :sparkles:
+
+            > **Remember to support your issue by voting!**
+            Get more information [here](https://docs.suitecrm.com/community/raising-issues/issues-voting/)
+          reactions: '+1'
diff --git a/public/legacy/.github/SECURITY.md b/public/legacy/.github/SECURITY.md
old mode 100644
new mode 100755
index eabe471e4..a5a030654
--- a/public/legacy/.github/SECURITY.md
+++ b/public/legacy/.github/SECURITY.md
@@ -6,4 +6,6 @@ For a list of supported versions, please see the documentation [Supported Versio
 
 ## Reporting a Vulnerability
 
+To report a security issue, please use the GitHub Security Advisory ["Report a Vulnerability"](https://github.com/salesagility/SuiteCRM-Core/security/advisories/new) tab.
+
 For details on how to report a vulnerability please check our [Security Policy](https://docs.suitecrm.com/community/security-policy/) page.