diff --git a/packages/amplify_core/lib/src/config/amplify_outputs/storage/bucket_outputs.dart b/packages/amplify_core/lib/src/config/amplify_outputs/storage/bucket_outputs.dart
new file mode 100644
index 0000000000..e156f08567
--- /dev/null
+++ b/packages/amplify_core/lib/src/config/amplify_outputs/storage/bucket_outputs.dart
@@ -0,0 +1,47 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import 'package:amplify_core/amplify_core.dart';
+
+part 'bucket_outputs.g.dart';
+
+/// {@template amplify_core.amplify_outputs.bucket_outputs}
+/// The Amplify Gen 2 outputs for Buckets in the Storage category.
+/// {@endtemplate}
+@zAmplifyOutputsSerializable
+class BucketOutputs
+    with AWSEquatable<BucketOutputs>, AWSSerializable, AWSDebuggable {
+  /// {@macro amplify_core.amplify_outputs.bucket_outputs}
+  const BucketOutputs({
+    required this.name,
+    required this.bucketName,
+    required this.awsRegion,
+  });
+
+  factory BucketOutputs.fromJson(Map<String, Object?> json) =>
+      _$BucketOutputsFromJson(json);
+
+  /// The user friendly name of the bucket
+  final String name;
+
+  /// The Amazon S3 bucket name.
+  final String bucketName;
+
+  /// The AWS region of Amazon S3 resources.
+  final String awsRegion;
+
+  @override
+  List<Object?> get props => [
+        name,
+        bucketName,
+        awsRegion,
+      ];
+
+  @override
+  String get runtimeTypeName => 'BucketOutputs';
+
+  @override
+  Object? toJson() {
+    return _$BucketOutputsToJson(this);
+  }
+}
diff --git a/packages/amplify_core/lib/src/config/amplify_outputs/storage/bucket_outputs.g.dart b/packages/amplify_core/lib/src/config/amplify_outputs/storage/bucket_outputs.g.dart
new file mode 100644
index 0000000000..0d60c85fcc
--- /dev/null
+++ b/packages/amplify_core/lib/src/config/amplify_outputs/storage/bucket_outputs.g.dart
@@ -0,0 +1,34 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+// ignore_for_file: deprecated_member_use_from_same_package
+
+part of 'bucket_outputs.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+BucketOutputs _$BucketOutputsFromJson(Map<String, dynamic> json) =>
+    $checkedCreate(
+      'BucketOutputs',
+      json,
+      ($checkedConvert) {
+        final val = BucketOutputs(
+          name: $checkedConvert('name', (v) => v as String),
+          bucketName: $checkedConvert('bucket_name', (v) => v as String),
+          awsRegion: $checkedConvert('aws_region', (v) => v as String),
+        );
+        return val;
+      },
+      fieldKeyMap: const {
+        'bucketName': 'bucket_name',
+        'awsRegion': 'aws_region'
+      },
+    );
+
+Map<String, dynamic> _$BucketOutputsToJson(BucketOutputs instance) =>
+    <String, dynamic>{
+      'name': instance.name,
+      'bucket_name': instance.bucketName,
+      'aws_region': instance.awsRegion,
+    };
diff --git a/packages/amplify_core/lib/src/config/amplify_outputs/storage/storage_outputs.dart b/packages/amplify_core/lib/src/config/amplify_outputs/storage/storage_outputs.dart
index 9db9356aa6..fec0ec0662 100644
--- a/packages/amplify_core/lib/src/config/amplify_outputs/storage/storage_outputs.dart
+++ b/packages/amplify_core/lib/src/config/amplify_outputs/storage/storage_outputs.dart
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:amplify_core/amplify_core.dart';
+import 'package:amplify_core/src/config/amplify_outputs/storage/bucket_outputs.dart';
 
 part 'storage_outputs.g.dart';
 
@@ -12,7 +13,11 @@ part 'storage_outputs.g.dart';
 class StorageOutputs
     with AWSEquatable<StorageOutputs>, AWSSerializable, AWSDebuggable {
   /// {@macro amplify_core.amplify_outputs.storage_outputs}
-  const StorageOutputs({required this.awsRegion, required this.bucketName});
+  const StorageOutputs({
+    required this.awsRegion,
+    required this.bucketName,
+    this.buckets,
+  });
 
   factory StorageOutputs.fromJson(Map<String, Object?> json) =>
       _$StorageOutputsFromJson(json);
@@ -23,8 +28,11 @@ class StorageOutputs
   /// The Amazon S3 bucket name.
   final String bucketName;
 
+  /// The list of buckets if there are multiple buckets for the project
+  final List<BucketOutputs>? buckets;
+
   @override
-  List<Object?> get props => [awsRegion, bucketName];
+  List<Object?> get props => [awsRegion, bucketName, buckets];
 
   @override
   String get runtimeTypeName => 'StorageOutputs';
diff --git a/packages/amplify_core/lib/src/config/amplify_outputs/storage/storage_outputs.g.dart b/packages/amplify_core/lib/src/config/amplify_outputs/storage/storage_outputs.g.dart
index 7b90421189..40d147f387 100644
--- a/packages/amplify_core/lib/src/config/amplify_outputs/storage/storage_outputs.g.dart
+++ b/packages/amplify_core/lib/src/config/amplify_outputs/storage/storage_outputs.g.dart
@@ -16,6 +16,12 @@ StorageOutputs _$StorageOutputsFromJson(Map<String, dynamic> json) =>
         final val = StorageOutputs(
           awsRegion: $checkedConvert('aws_region', (v) => v as String),
           bucketName: $checkedConvert('bucket_name', (v) => v as String),
+          buckets: $checkedConvert(
+              'buckets',
+              (v) => (v as List<dynamic>?)
+                  ?.map(
+                      (e) => BucketOutputs.fromJson(e as Map<String, dynamic>))
+                  .toList()),
         );
         return val;
       },
@@ -25,8 +31,18 @@ StorageOutputs _$StorageOutputsFromJson(Map<String, dynamic> json) =>
       },
     );
 
-Map<String, dynamic> _$StorageOutputsToJson(StorageOutputs instance) =>
-    <String, dynamic>{
-      'aws_region': instance.awsRegion,
-      'bucket_name': instance.bucketName,
-    };
+Map<String, dynamic> _$StorageOutputsToJson(StorageOutputs instance) {
+  final val = <String, dynamic>{
+    'aws_region': instance.awsRegion,
+    'bucket_name': instance.bucketName,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('buckets', instance.buckets?.map((e) => e.toJson()).toList());
+  return val;
+}
diff --git a/packages/amplify_core/test/config/amplify_outputs/test_data.dart b/packages/amplify_core/test/config/amplify_outputs/test_data.dart
index 317e7a78b4..4a1f5e7b87 100644
--- a/packages/amplify_core/test/config/amplify_outputs/test_data.dart
+++ b/packages/amplify_core/test/config/amplify_outputs/test_data.dart
@@ -99,9 +99,26 @@ const amplifyoutputs = '''{
     ]
   },
   "storage": {
-    "aws_region": "oem dks",
-    "bucket_name": "dolor et esse"
-  },
+    "aws_region": "us-east-2",
+    "bucket_name": "amplifyTeamDrive-one-stora-testbucketgen2bucket0b8c-9ggcfqfunkjr",
+    "buckets": [
+        {
+            "name": "amplifyTeamDrive-one",
+            "bucket_name": "amplifyTeamDrive-one-stora-testbucketgen2bucket0b8c-9ggcfqfunkjr",
+            "aws_region": "us-east-2"
+        },
+        {
+            "name": "amplifyTeamDrive-two",
+            "bucket_name": "amplifyTeamDrive-two-stora-testbucketgen2bucket0b8c-2",
+            "aws_region": "us-east-2"
+        },
+        {
+            "name": "amplifyTeamDrive-three",
+            "bucket_name": "amplifyTeamDrive-three-stora-testbucketgen2bucket0b8c-3",
+            "aws_region": "us-east-2"
+        }
+    ]
+},
   "version": "1"
 }
 ''';