diff --git a/pkg/services/supportbundles/supportbundlesimpl/collectors.go b/pkg/services/supportbundles/supportbundlesimpl/collectors.go
index 0ec83c8ccc4..961933708d1 100644
--- a/pkg/services/supportbundles/supportbundlesimpl/collectors.go
+++ b/pkg/services/supportbundles/supportbundlesimpl/collectors.go
@@ -51,7 +51,7 @@ func basicCollector(cfg *setting.Cfg) supportbundles.Collector {
 			loc, _ := time.LoadLocation("UTC")
 			now := collectionDate.In(loc)
 
-			data, err := json.Marshal(basicInfo{
+			info := basicInfo{
 				Version:         cfg.BuildVersion,
 				Commit:          cfg.BuildCommit,
 				CollectionDate:  now,
@@ -69,7 +69,8 @@ func basicCollector(cfg *setting.Cfg) supportbundles.Collector {
 				GoOS:            runtime.GOOS,
 				GoArch:          runtime.GOARCH,
 				GoCompiler:      runtime.Compiler,
-			})
+			}
+			data, err := json.MarshalIndent(info, "", " ")
 			if err != nil {
 				return nil, err
 			}
@@ -91,7 +92,7 @@ func settingsCollector(settings setting.Provider) supportbundles.Collector {
 		Default:           true,
 		Fn: func(ctx context.Context) (*supportbundles.SupportItem, error) {
 			current := settings.Current()
-			data, err := json.Marshal(current)
+			data, err := json.MarshalIndent(current, "", " ")
 			if err != nil {
 				return nil, err
 			}
diff --git a/public/app/features/support-bundles/SupportBundlesCreate.tsx b/public/app/features/support-bundles/SupportBundlesCreate.tsx
index 4d1b59ee72c..10fea8602cc 100644
--- a/public/app/features/support-bundles/SupportBundlesCreate.tsx
+++ b/public/app/features/support-bundles/SupportBundlesCreate.tsx
@@ -66,20 +66,22 @@ export const SupportBundlesCreateUnconnected = ({
             {({ register, errors }) => {
               return (
                 <>
-                  {collectors.map((component) => {
-                    return (
-                      <Field key={component.uid}>
-                        <Checkbox
-                          {...register(component.uid)}
-                          label={component.displayName}
-                          id={component.uid}
-                          description={component.description}
-                          defaultChecked={component.default}
-                          disabled={component.includedByDefault}
-                        />
-                      </Field>
-                    );
-                  })}
+                  {[...collectors]
+                    .sort((a, b) => a.displayName.localeCompare(b.displayName))
+                    .map((component) => {
+                      return (
+                        <Field key={component.uid}>
+                          <Checkbox
+                            {...register(component.uid)}
+                            label={component.displayName}
+                            id={component.uid}
+                            description={component.description}
+                            defaultChecked={component.default}
+                            disabled={component.includedByDefault}
+                          />
+                        </Field>
+                      );
+                    })}
                   <HorizontalGroup>
                     <Button type="submit">Create</Button>
                     <LinkButton href="/support-bundles" variant="secondary">