diff --git a/pkg/_fe_analyzer_shared/pubspec.yaml b/pkg/_fe_analyzer_shared/pubspec.yaml
index 4a30fc73512..3f873686ee7 100644
--- a/pkg/_fe_analyzer_shared/pubspec.yaml
+++ b/pkg/_fe_analyzer_shared/pubspec.yaml
@@ -1,11 +1,13 @@
 name: _fe_analyzer_shared
 version: 39.0.0
 description: Logic that is shared between the front_end and analyzer packages.
-homepage: https://github.com/dart-lang/sdk/tree/master/pkg/_fe_analyzer_shared
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/_fe_analyzer_shared
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
+
 dependencies:
   meta: ^1.0.2
+
 dev_dependencies:
   test: ^1.3.4
diff --git a/pkg/analysis_server_client/pubspec.yaml b/pkg/analysis_server_client/pubspec.yaml
index 8b9c79522d2..c243b321f67 100644
--- a/pkg/analysis_server_client/pubspec.yaml
+++ b/pkg/analysis_server_client/pubspec.yaml
@@ -4,12 +4,15 @@ description:
   A client wrapper over analysis_server.
   Instances of the class [Server] manage a connection to a server process,
   and facilitate communication to and from the server.
-homepage: https://github.com/dart-lang/sdk/tree/master/pkg/analysis_server_client
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/analysis_server_client
+
 environment:
   sdk: '>=2.12.0 <3.0.0'
+
 dependencies:
   path: ^1.8.0
   pub_semver: ^2.0.0
+
 dev_dependencies:
   analyzer:
     path: ../analyzer
diff --git a/pkg/analyzer/pubspec.yaml b/pkg/analyzer/pubspec.yaml
index 52861156666..bf5c078a875 100644
--- a/pkg/analyzer/pubspec.yaml
+++ b/pkg/analyzer/pubspec.yaml
@@ -1,7 +1,7 @@
 name: analyzer
 version: 4.1.0-dev
 description: This package provides a library that performs static analysis of Dart code.
-homepage: https://github.com/dart-lang/sdk/tree/main/pkg/analyzer
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/analyzer
 
 environment:
   sdk: '>=2.14.0 <3.0.0'
@@ -19,6 +19,7 @@ dependencies:
   source_span: ^1.8.0
   watcher: ^1.0.0
   yaml: ^3.0.0
+
 dev_dependencies:
   analyzer_utilities:
     path: ../analyzer_utilities
diff --git a/pkg/analyzer_plugin/pubspec.yaml b/pkg/analyzer_plugin/pubspec.yaml
index c8b99c82e0d..60a7d226ae4 100644
--- a/pkg/analyzer_plugin/pubspec.yaml
+++ b/pkg/analyzer_plugin/pubspec.yaml
@@ -1,7 +1,7 @@
 name: analyzer_plugin
 description: A framework and support code for building plugins for the analysis server.
 version: 0.9.0
-homepage: https://github.com/dart-lang/sdk/tree/master/pkg/analyzer_plugin
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/analyzer_plugin
 
 environment:
   sdk: '>=2.14.0 <3.0.0'
diff --git a/pkg/dart2js_runtime_metrics/pubspec.yaml b/pkg/dart2js_runtime_metrics/pubspec.yaml
index c79dd5a4348..7b9b43935a3 100644
--- a/pkg/dart2js_runtime_metrics/pubspec.yaml
+++ b/pkg/dart2js_runtime_metrics/pubspec.yaml
@@ -2,7 +2,6 @@ name: dart2js_runtime_metrics
 # This package is not intended for consumption on pub.dev. DO NOT publish.
 publish_to: none
 version: 0.1.0
-repository: https://github.com/dart-lang/sdk/tree/master/pkg/dart2js_runtime_metrics
 description: >-
   `dart2js` can generate extra code to measure certain activities.
   This library provides access to the measurements at runtime.
diff --git a/pkg/dart_internal/pubspec.yaml b/pkg/dart_internal/pubspec.yaml
index 51a630d1e7f..0c529665010 100644
--- a/pkg/dart_internal/pubspec.yaml
+++ b/pkg/dart_internal/pubspec.yaml
@@ -1,10 +1,10 @@
 name: dart_internal
 version: 0.2.5
-repository: https://github.com/dart-lang/sdk/tree/master/pkg/dart_internal
 description: >-
   This package is not intended for wide use. It provides a temporary API to
   solve the problem: "Given an object some generic type A, how do I construct an
   instance of generic type B with the same type argument(s)?"
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/dart_internal
 
 environment:
   # Restrict the upper bound so that we can remove support for this in a later
diff --git a/pkg/dds/pubspec.yaml b/pkg/dds/pubspec.yaml
index bfb5a96108b..ba302d58bdd 100644
--- a/pkg/dds/pubspec.yaml
+++ b/pkg/dds/pubspec.yaml
@@ -1,11 +1,9 @@
 name: dds
+version: 2.2.1
 description: >-
   A library used to spawn the Dart Developer Service, used to communicate with
   a Dart VM Service instance.
-
-version: 2.2.1
-
-homepage: https://github.com/dart-lang/sdk/tree/master/pkg/dds
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/dds
 
 environment:
   sdk: '>=2.14.0 <3.0.0'
diff --git a/pkg/dds_service_extensions/pubspec.yaml b/pkg/dds_service_extensions/pubspec.yaml
index 06b514647e2..f26c41ba4da 100644
--- a/pkg/dds_service_extensions/pubspec.yaml
+++ b/pkg/dds_service_extensions/pubspec.yaml
@@ -1,18 +1,16 @@
 name: dds_service_extensions
+version: 1.3.0
 description: >-
   Extension methods for `package:vm_service`, used to make requests a
   Dart Development Service (DDS) instance.
-
-version: 1.3.0
-
-homepage: https://github.com/dart-lang/sdk/tree/master/pkg/dds_service_extensions
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/dds_service_extensions
 
 environment:
   sdk: '>=2.13.0 <3.0.0'
 
 dependencies:
-   async: ^2.4.1
-   vm_service: ^8.1.0
+  async: ^2.4.1
+  vm_service: ^8.1.0
 
 dev_dependencies:
   lints: any
diff --git a/pkg/js/pubspec.yaml b/pkg/js/pubspec.yaml
index 7452bb889dc..5f5000f184f 100644
--- a/pkg/js/pubspec.yaml
+++ b/pkg/js/pubspec.yaml
@@ -1,7 +1,7 @@
 name: js
 version: 0.6.4
 description: Annotations to create static Dart interfaces for JavaScript APIs.
-homepage: https://github.com/dart-lang/sdk/tree/master/pkg/js
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/js
 
 environment:
   sdk: ">=2.16.0-100.0.dev <3.0.0"
diff --git a/pkg/meta/pubspec.yaml b/pkg/meta/pubspec.yaml
index 2e3c2386072..ea5763c8ac2 100644
--- a/pkg/meta/pubspec.yaml
+++ b/pkg/meta/pubspec.yaml
@@ -1,10 +1,11 @@
 name: meta
 # Note, because version `2.0.0` was mistakenly released, the next major version must be `3.x.y`.
 version: 1.7.1-dev
-homepage: https://github.com/dart-lang/sdk/tree/main/pkg/meta
 description: >-
  Annotations that developers can use to express the intentions that otherwise
  can't be deduced by statically analyzing the source code. These annotations
  are intended to be used by tools to provide a better user experience.
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/meta
+
 environment:
   sdk: ">=2.12.0 <3.0.0"
diff --git a/pkg/native_stack_traces/pubspec.yaml b/pkg/native_stack_traces/pubspec.yaml
index a0d22e5e6d9..50320e5b6dc 100644
--- a/pkg/native_stack_traces/pubspec.yaml
+++ b/pkg/native_stack_traces/pubspec.yaml
@@ -1,8 +1,7 @@
 name: native_stack_traces
-description: Utilities for working with non-symbolic stack traces.
 version: 0.4.5
-
-homepage: https://github.com/dart-lang/sdk/tree/master/pkg/native_stack_traces
+description: Utilities for working with non-symbolic stack traces.
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/native_stack_traces
 
 environment:
   sdk: '>=2.14.0 <3.0.0'
diff --git a/pkg/vm_service/pubspec.yaml b/pkg/vm_service/pubspec.yaml
index c6e4c3ac854..8d8a7748fe0 100644
--- a/pkg/vm_service/pubspec.yaml
+++ b/pkg/vm_service/pubspec.yaml
@@ -1,11 +1,9 @@
 name: vm_service
+version: 8.2.2+1
 description: >-
   A library to communicate with a service implementing the Dart VM
   service protocol.
-
-version: 8.2.2+1
-
-homepage: https://github.com/dart-lang/sdk/tree/master/pkg/vm_service
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/vm_service
 
 environment:
   sdk: '>=2.15.0 <3.0.0'
diff --git a/pkg/vm_snapshot_analysis/pubspec.yaml b/pkg/vm_snapshot_analysis/pubspec.yaml
index 45627e60b33..10816d4023f 100644
--- a/pkg/vm_snapshot_analysis/pubspec.yaml
+++ b/pkg/vm_snapshot_analysis/pubspec.yaml
@@ -1,8 +1,7 @@
 name: vm_snapshot_analysis
-description: Utilities for analysing AOT snapshot size.
 version: 0.7.1
-
-homepage: https://github.com/dart-lang/sdk/tree/master/pkg/vm_snapshot_analysis
+description: Utilities for analysing AOT snapshot size.
+repository: https://github.com/dart-lang/sdk/tree/main/pkg/vm_snapshot_analysis
 
 environment:
   sdk: '>=2.12.0 <3.0.0'