diff --git a/.github/workflows/health.yaml b/.github/workflows/health.yaml
index 3f1481968..7a5a1cafb 100644
--- a/.github/workflows/health.yaml
+++ b/.github/workflows/health.yaml
@@ -1,13 +1,10 @@
 name: Health
 on:
   pull_request:
-    branches: [ main ]
     # Remove paths after https://github.com/bmw-tech/dart_apitool/issues/177 is addressed.
     paths:
-      - "pkgs/ffi/**"
-      - "pkgs/native_assets_builder/**"
-      - "pkgs/native_assets_cli/**"
-      - "pkgs/native_toolchain_c/**"
+      - ".github/workflows/health.yaml"
+      - "pkgs/**"
     types: [opened, synchronize, reopened, labeled, unlabeled]
 jobs:
   health:
@@ -15,8 +12,12 @@ jobs:
     with:
       coverage_web: false
       # TODO(https://github.com/dart-lang/native/issues/1242): Add coverage back.
-      checks: "version,changelog,license,do-not-submit,breaking,leaking"
-      use-flutter: true
-      sdk: master
+      checks: "changelog,license,do-not-submit,breaking,leaking"
+      flutter_packages: "pkgs/ffigen,pkgs/jni,pkgs/jnigen,pkgs/objective_c"
+      ignore_license: "**.g.dart"
+      ignore_coverage: "**.mock.dart,**.g.dart"
+      ignore_packages: "pkgs/swiftgen,pkgs/jnigen,pkgs/swift2objc"
+      sdk: dev
+      channel: master
     permissions:
       pull-requests: write
diff --git a/.github/workflows/health_flutter.yaml b/.github/workflows/health_flutter.yaml
deleted file mode 100644
index 6432947d0..000000000
--- a/.github/workflows/health_flutter.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Health
-on:
-  pull_request:
-    branches: [ main ]
-    # Merge back into health.yaml after https://github.com/bmw-tech/dart_apitool/issues/177 is addressed.
-    paths:
-      - "pkgs/ffigen/**"
-      - "pkgs/jni/**"
-      - "pkgs/jnigen/**"
-      - "pkgs/objective_c/**"
-    types: [opened, synchronize, reopened, labeled, unlabeled]
-jobs:
-  health:
-    uses: dart-lang/ecosystem/.github/workflows/health.yaml@main
-    with:
-      coverage_web: false
-      checks: "version,changelog,license,do-not-submit,coverage"
-      use-flutter: true
-      sdk: master
-    permissions:
-      pull-requests: write
diff --git a/pkgs/ffigen/CHANGELOG.md b/pkgs/ffigen/CHANGELOG.md
index fbb1224a8..6cb89ddea 100644
--- a/pkgs/ffigen/CHANGELOG.md
+++ b/pkgs/ffigen/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 16.0.1-wip
+## 17.0.0-wip
 
 - Ensure that required symbols are available to FFI even when the final binary
   is linked with `-dead_strip`.
diff --git a/pkgs/ffigen/example/shared_bindings/generate.dart b/pkgs/ffigen/example/shared_bindings/generate.dart
index 508f98137..8df754d12 100644
--- a/pkgs/ffigen/example/shared_bindings/generate.dart
+++ b/pkgs/ffigen/example/shared_bindings/generate.dart
@@ -1,3 +1,7 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 import 'dart:io';
 
 import 'package:cli_util/cli_util.dart';
diff --git a/pkgs/ffigen/pubspec.yaml b/pkgs/ffigen/pubspec.yaml
index 0ae4f98b9..a6cd6c6b4 100644
--- a/pkgs/ffigen/pubspec.yaml
+++ b/pkgs/ffigen/pubspec.yaml
@@ -3,7 +3,7 @@
 # BSD-style license that can be found in the LICENSE file.
 
 name: ffigen
-version: 16.0.1-wip
+version: 17.0.0-wip
 description: >
   Generator for FFI bindings, using LibClang to parse C, Objective-C, and Swift
   files.
diff --git a/pkgs/jnigen/CHANGELOG.md b/pkgs/jnigen/CHANGELOG.md
index d6d7ee1a0..f8371037a 100644
--- a/pkgs/jnigen/CHANGELOG.md
+++ b/pkgs/jnigen/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Fixed a potential name collision when generating in multi-file mode.
 - Added the ability to add user-defined visitors to config. Currently only
   capable of excluding classes, methods, and fields.
+- Add dependency override for `package:jni` instead of the path dependency.
 
 ## 0.12.2
 
diff --git a/pkgs/jnigen/pubspec.yaml b/pkgs/jnigen/pubspec.yaml
index 4585b5feb..e46163daa 100644
--- a/pkgs/jnigen/pubspec.yaml
+++ b/pkgs/jnigen/pubspec.yaml
@@ -32,7 +32,10 @@ dependencies:
 dev_dependencies:
   build_runner: ^2.4.12
   dart_flutter_team_lints: ^3.2.0
-  jni:
-    path: ../jni
+  jni: ^0.12.2
   json_serializable: ^6.8.0
   test: ^1.25.8
+
+dependency_overrides:
+  jni:
+    path: ../jni
diff --git a/pkgs/objective_c/CHANGELOG.md b/pkgs/objective_c/CHANGELOG.md
index e3b4b3899..9e94380db 100644
--- a/pkgs/objective_c/CHANGELOG.md
+++ b/pkgs/objective_c/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 4.0.1-wip
+## 4.1.0-wip
 
 - Reduces the chances of duplicate symbols by adding a `DOBJC_` prefix.
 - Ensure that required symbols are available to FFI even when the final binary
diff --git a/pkgs/objective_c/pubspec.yaml b/pkgs/objective_c/pubspec.yaml
index 3889e91a4..fd40a11ac 100644
--- a/pkgs/objective_c/pubspec.yaml
+++ b/pkgs/objective_c/pubspec.yaml
@@ -4,7 +4,7 @@
 
 name: objective_c
 description: 'A library to access Objective C from Flutter that acts as a support library for package:ffigen.'
-version: 4.0.1-wip
+version: 4.1.0-wip
 repository: https://github.com/dart-lang/native/tree/main/pkgs/objective_c
 issue_tracker: https://github.com/dart-lang/native/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Aobjective_c