diff --git a/.github/ISSUE_TEMPLATE/Bug Report.yml b/.github/ISSUE_TEMPLATE/Bug Report.yml
index ac5a1ac..c6188e5 100644
--- a/.github/ISSUE_TEMPLATE/Bug Report.yml	
+++ b/.github/ISSUE_TEMPLATE/Bug Report.yml	
@@ -13,11 +13,11 @@ body:
     attributes:
       label: Checklist
       options:
-        - label: I have looked into the [README](https://github.com/auth0/SimpleKeychain#readme) and the [Examples](https://github.com/auth0/SimpleKeychain/blob/master/EXAMPLES.md) and have not found a suitable solution or answer.
+        - label: I have looked into the [Readme](https://github.com/auth0/SimpleKeychain#readme) and the [Examples](https://github.com/auth0/SimpleKeychain/blob/master/EXAMPLES.md), and have not found a suitable solution or answer.
           required: true
         - label: I have searched the [issues](https://github.com/auth0/SimpleKeychain/issues) and have not found a suitable solution or answer.
           required: true
-        - label: I have searched the [Auth0 Community](https://community.auth0.com/tags/c/sdks/5/ios) forums and have not found a suitable solution or answer.
+        - label: I have searched the [Auth0 Community](https://community.auth0.com) forums and have not found a suitable solution or answer.
           required: true
         - label: I agree to the terms within the [Auth0 Code of Conduct](https://github.com/auth0/open-source-template/blob/master/CODE-OF-CONDUCT.md).
           required: true
@@ -42,6 +42,14 @@ body:
     validations:
       required: true
 
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Other libraries that might be involved, or any other relevant information you think would be useful.
+    validations:
+      required: false
+
   - type: input
     id: environment-version
     attributes:
@@ -78,10 +86,15 @@ body:
     validations:
       required: true
 
-  - type: input
+  - type: dropdown
     id: environment-package-manager
     attributes:
       label: Package manager
-      placeholder: SPM, Cocoapods, Carthage, etc.
+      multiple: false
+      options:
+        - Swift Package Manager
+        - Cocoapods
+        - Carthage
+        - None
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/Feature Request.yml b/.github/ISSUE_TEMPLATE/Feature Request.yml
index f669569..93de4ba 100644
--- a/.github/ISSUE_TEMPLATE/Feature Request.yml	
+++ b/.github/ISSUE_TEMPLATE/Feature Request.yml	
@@ -8,11 +8,11 @@ body:
     attributes:
       label: Checklist
       options:
-        - label: I have looked into the [README](https://github.com/auth0/SimpleKeychain#readme) and the [Examples](https://github.com/auth0/SimpleKeychain/blob/master/EXAMPLES.md) and have not found a suitable solution or answer.
+        - label: I have looked into the [Readme](https://github.com/auth0/SimpleKeychain#readme) and the [Examples](https://github.com/auth0/SimpleKeychain/blob/master/EXAMPLES.md), and have not found a suitable solution or answer.
           required: true
         - label: I have searched the [issues](https://github.com/auth0/SimpleKeychain/issues) and have not found a suitable solution or answer.
           required: true
-        - label: I have searched the [Auth0 Community](https://community.auth0.com/tags/c/sdks/5/ios) forums and have not found a suitable solution or answer.
+        - label: I have searched the [Auth0 Community](https://community.auth0.com) forums and have not found a suitable solution or answer.
           required: true
         - label: I agree to the terms within the [Auth0 Code of Conduct](https://github.com/auth0/open-source-template/blob/master/CODE-OF-CONDUCT.md).
           required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 51997f6..2fadedd 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: 🤔 Help & Questions
-    url: https://community.auth0.com/tags/c/sdks/5/ios
+    url: https://community.auth0.com
     about: Ask general support or usage questions in the Auth0 Community forums
   - name: 🚀 Usage
     url: https://github.com/auth0/SimpleKeychain#usage