diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index a27d79911c..45373fdb5b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -33,7 +33,7 @@ body:
     id: amplify-version
     attributes:
       label: Amplify Framework Version
-      placeholder: e.g. 1.5.3
+      placeholder: e.g. 2.12.0
     validations:
       required: true
   - type: dropdown
@@ -65,25 +65,21 @@ body:
     id: swift
     attributes:
       label: Swift version
-      placeholder: e.g. 5.0
+      placeholder: e.g. 5.8
     validations:
       required: true
   - type: input
     id: cli
     attributes:
       label: CLI version
-      placeholder: |
-        - e.g. 4.41.2
-        - Run `amplify version`
+      placeholder: e.g. 12.1.1 -- run `amplify version`
     validations:
       required: true
   - type: input
     id: xcode
     attributes:
       label: Xcode version
-      placeholder: |
-        - e.g. 12.4 (12D4e)
-        - Run `xcodebuild -version`
+      placeholder: e.g. 14.3.1 (14E300c) -- run `xcodebuild -version`
     validations:
       required: true
   - type: textarea
@@ -117,21 +113,29 @@ body:
     attributes:
       label: Regression additional context
       placeholder: If it was a regression provide the versions used before and after the upgrade.
-    
+  - type: dropdown
+    id: platforms
+    attributes:
+      label: Platforms
+      multiple: true
+      options:
+        - iOS
+        - macOS
+        - tvOS
+        - watchOS
+        - visionOS (Preview)
   - type: input
-    id: device
+    id: os-version
     attributes:
-      label: Device
-      placeholder: |
-        - e.g. iPhone6
-        - Simulator
+      label: OS Version
+      placeholder: e.g. iOS 15.3 / macOS 11.0
     validations:
       required: true
   - type: input
-    id: ios-version
+    id: device
     attributes:
-      label: iOS Version
-      placeholder: e.g. iOS 11
+      label: Device
+      placeholder: e.g. iPhone6
     validations:
       required: true
   - type: input
diff --git a/README.md b/README.md
index eed91627a9..d53557782f 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,16 @@ The Amplify Library for Swift is layered on the [AWS SDK for Swift](https://aws.
 
 ## Platform Support
 
-Amplify supports iOS 13+, macOS 10.15+, watchOS 7+, and tvOS 13+.
+| Platform  | Versions  | Support Level |
+| ---------: | -------:  | :-----------: |
+| iOS       | 13+       | GA            |
+| macOS     | 10.15+    | GA            |
+| tvOS      | 13+       | GA            |
+| watchOS   | 7+        | GA            |
+| visionOS  | 1+        | Preview*      |
+
+> To use Amplify Swift with visionOS, you'll need to target the `visionos-preview` branch.
+> For more information, see [Platform Support](https://github.com/aws-amplify/amplify-swift/tree/visionos-preview#platform-support) on the `visionos-preview` branch.
 
 ## License