diff --git a/distros/ament-cmake-core-setup-hook.sh b/distros/ament-package-setup-hook.sh
similarity index 84%
rename from distros/ament-cmake-core-setup-hook.sh
rename to distros/ament-package-setup-hook.sh
index 823e66d028..f9a37105d6 100644
--- a/distros/ament-cmake-core-setup-hook.sh
+++ b/distros/ament-package-setup-hook.sh
@@ -13,7 +13,9 @@ _findAmentPackages() {
   then
     # ROS scripts use unbound variables
     set +u
-    source "$pkg"/share/*/local_setup.sh
+    for setup in "$pkg"/share/*/local_setup.sh; do
+      source "$setup"
+    done
     set -u
   fi
   _amentPackagesSeen["$pkg"]=1
diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix
index 25c70e4e8b..4814e5a62e 100644
--- a/distros/distro-overlay.nix
+++ b/distros/distro-overlay.nix
@@ -24,11 +24,8 @@ let
   overrides = rosSelf: rosSuper: with rosSelf.lib; {
     # ROS package overrides/fixups
 
-    ament-cmake-core = rosSuper.ament-cmake-core.overrideAttrs ({
-      propagatedBuildInputs ? [], ...
-    }: {
-      propagatedBuildInputs = [ self.cmake rosSelf.ament-package ] ++ propagatedBuildInputs;
-      setupHook = ./ament-cmake-core-setup-hook.sh;
+    ament-package = rosSuper.ament-package.overrideAttrs ({ ... }: {
+      setupHook = ./ament-package-setup-hook.sh;
     });
 
     camera-calibration-parsers = patchBoostPython rosSuper.camera-calibration-parsers;