diff --git a/meta-ros2-rolling/conf/ros-distro/include/rolling/generated/superflore-ros-distro.inc b/meta-ros2-rolling/conf/ros-distro/include/rolling/generated/superflore-ros-distro.inc
index 55de17f0269..1103ae47bc9 100644
--- a/meta-ros2-rolling/conf/ros-distro/include/rolling/generated/superflore-ros-distro.inc
+++ b/meta-ros2-rolling/conf/ros-distro/include/rolling/generated/superflore-ros-distro.inc
@@ -29,7 +29,7 @@ ROS_SUPERFLORE_GENERATION_NOT_POSSIBLE = " \
 
 # Number of commits that will be returned by "git log meta-ros2-rolling/files/rolling/generated/cache.yaml" when the
 # generated files are committed. This is used for the fourth version field of DISTRO_VERSION.
-ROS_NUM_CACHE_YAML_COMMITS = "4"
+ROS_NUM_CACHE_YAML_COMMITS = "5"
 
 # Iterated values of ROS_DISTRO-cache.distribution_file.release_platforms.<LINUX-DISTRO>.[ <NAME> ... ] .
 ROS_DISTRO_RELEASE_PLATFORMS = " \
@@ -1366,7 +1366,6 @@ ROS_SUPERFLORE_GENERATED_BUILDTOOLS_append = " ${ROS_SUPERFLORE_GENERATED_BUILDT
 ROS_SUPERFLORE_GENERATED_PLATFORM_PACKAGE_DEPENDENCIES = " \
     ${PYTHON_PN}-pydocstyle \
     ${PYTHON_PN}-pyflakes \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_benchmark} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_clang-format} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_clang-tidy} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libipopt-dev} \
@@ -1374,38 +1373,14 @@ ROS_SUPERFLORE_GENERATED_PLATFORM_PACKAGE_DEPENDENCIES = " \
     ${ROS_UNRESOLVED_PLATFORM_PKG_gurumdds-2.6} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_java-native} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_jupyter-notebook} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-iostreams-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-python-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-python} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-system-dev} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_libcunit-dev} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_libgazebo11-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libgps} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libncurses-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libusb-1.0} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libxmlrpc-c++} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libzstd-dev} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_maven-native} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_python3-argcomplete} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-catkin-pkg} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-cryptography} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-ifcfg} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-importlib-metadata} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-mypy} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-netifaces} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pandas} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pycodestyle} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pyproj} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pytest-mock} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-qt5-bindings} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_python3-requests} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-rospkg-modules} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-sphinx} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1-native} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_sdl2} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_spdlog} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_uncrustify} \
     asio \
     assimp \
@@ -1425,11 +1400,14 @@ ROS_SUPERFLORE_GENERATED_PLATFORM_PACKAGE_DEPENDENCIES = " \
     git \
     git-native \
     glog \
+    google-benchmark \
     gpgme \
+    gpsd \
     gtest \
     gtest-native \
     libeigen \
     libogg \
+    libsdl2 \
     libtheora \
     libtinyxml \
     libtinyxml2 \
@@ -1442,6 +1420,7 @@ ROS_SUPERFLORE_GENERATED_PLATFORM_PACKAGE_DEPENDENCIES = " \
     log4cxx \
     lua \
     mesa \
+    ncurses \
     opencv \
     openssl \
     pcl \
@@ -1450,36 +1429,49 @@ ROS_SUPERFLORE_GENERATED_PLATFORM_PACKAGE_DEPENDENCIES = " \
     protobuf \
     python3-catkin-pkg \
     python3-catkin-pkg-native \
+    python3-cryptography \
     python3-empy \
     python3-empy-native \
     python3-flake8 \
+    python3-ifcfg \
+    python3-importlib-metadata \
     python3-lark-parser \
     python3-lxml \
     python3-matplotlib \
     python3-mock \
+    python3-mypy \
     python3-native \
+    python3-netifaces \
     python3-nose-native \
     python3-numpy \
     python3-psutil \
+    python3-pycodestyle \
     python3-pydot \
     python3-pygraphviz \
+    python3-pyproj \
+    python3-pyqt5 \
     python3-pytest \
+    python3-pytest-mock \
     python3-pytest-native \
     python3-pyyaml \
     python3-rosdistro \
+    python3-rospkg \
     python3-setuptools \
+    python3-sphinx \
     qtbase \
+    spdlog \
     sqlite3 \
     suitesparse-cholmod \
     suitesparse-cxsparse \
+    xmlrpc-c \
     yaml-cpp \
     zeromq \
+    zstd \
 "
 
 # Packages found only in <test_depend> items. Does not include those found only in the ROS_*_DEPENDS of recipes of tests.
 ROS_SUPERFLORE_GENERATED_TESTS = " \
     ${ROS_UNRESOLVED_PLATFORM_PKG_libcunit-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pytest-mock} \
     ${ROS_UNRESOLVED_PLATFORM_PKG_python3-requests} \
     ament-cmake-google-benchmark \
     ament-copyright \
@@ -1493,6 +1485,7 @@ ROS_SUPERFLORE_GENERATED_TESTS = " \
     performance-test-fixture \
     python3-pygraphviz \
     python3-pytest \
+    python3-pytest-mock \
     ros-testing \
     ros2lifecycle-test-fixtures \
     rosbag2-test-common \
@@ -1661,7 +1654,6 @@ ROS_SUPERFLORE_GENERATED_RECIPES_FOR_COMPONENTS = " \
 
 # Platform packages without a OE-RECIPE@OE-LAYER mapping in base.yaml, python.yaml, or ruby.yaml. Until they are added, override
 # the settings in ros-distro.inc .
-ROS_UNRESOLVED_PLATFORM_PKG_benchmark = "UNRESOLVED-benchmark"
 ROS_UNRESOLVED_PLATFORM_PKG_clang-format = "UNRESOLVED-clang-format"
 ROS_UNRESOLVED_PLATFORM_PKG_clang-tidy = "UNRESOLVED-clang-tidy"
 ROS_UNRESOLVED_PLATFORM_PKG_coinor-libipopt-dev = "UNRESOLVED-coinor-libipopt-dev"
@@ -1669,38 +1661,14 @@ ROS_UNRESOLVED_PLATFORM_PKG_gazebo11 = "UNRESOLVED-gazebo11"
 ROS_UNRESOLVED_PLATFORM_PKG_gurumdds-2.6 = "UNRESOLVED-gurumdds-2.6"
 ROS_UNRESOLVED_PLATFORM_PKG_java-native = "UNRESOLVED-java-native"
 ROS_UNRESOLVED_PLATFORM_PKG_jupyter-notebook = "UNRESOLVED-jupyter-notebook"
-ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev = "UNRESOLVED-libboost-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libboost-iostreams-dev = "UNRESOLVED-libboost-iostreams-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libboost-python = "UNRESOLVED-libboost-python"
-ROS_UNRESOLVED_PLATFORM_PKG_libboost-python-dev = "UNRESOLVED-libboost-python-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libboost-system-dev = "UNRESOLVED-libboost-system-dev"
 ROS_UNRESOLVED_PLATFORM_PKG_libcunit-dev = "UNRESOLVED-libcunit-dev"
 ROS_UNRESOLVED_PLATFORM_PKG_libgazebo11-dev = "UNRESOLVED-libgazebo11-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libgps = "UNRESOLVED-libgps"
-ROS_UNRESOLVED_PLATFORM_PKG_libncurses-dev = "UNRESOLVED-libncurses-dev"
-ROS_UNRESOLVED_PLATFORM_PKG_libusb-1.0 = "UNRESOLVED-libusb-1.0"
-ROS_UNRESOLVED_PLATFORM_PKG_libxmlrpc-c++ = "UNRESOLVED-libxmlrpc-c++"
-ROS_UNRESOLVED_PLATFORM_PKG_libzstd-dev = "UNRESOLVED-libzstd-dev"
 ROS_UNRESOLVED_PLATFORM_PKG_maven-native = "UNRESOLVED-maven-native"
 ROS_UNRESOLVED_PLATFORM_PKG_python3-argcomplete = "UNRESOLVED-python3-argcomplete"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-catkin-pkg = "UNRESOLVED-python3-catkin-pkg"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-cryptography = "UNRESOLVED-python3-cryptography"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-ifcfg = "UNRESOLVED-python3-ifcfg"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-importlib-metadata = "UNRESOLVED-python3-importlib-metadata"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-mypy = "UNRESOLVED-python3-mypy"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-netifaces = "UNRESOLVED-python3-netifaces"
 ROS_UNRESOLVED_PLATFORM_PKG_python3-pandas = "UNRESOLVED-python3-pandas"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-pycodestyle = "UNRESOLVED-python3-pycodestyle"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-pyproj = "UNRESOLVED-python3-pyproj"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-pytest-mock = "UNRESOLVED-python3-pytest-mock"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-qt5-bindings = "UNRESOLVED-python3-qt5-bindings"
 ROS_UNRESOLVED_PLATFORM_PKG_python3-requests = "UNRESOLVED-python3-requests"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-rospkg-modules = "UNRESOLVED-python3-rospkg-modules"
-ROS_UNRESOLVED_PLATFORM_PKG_python3-sphinx = "UNRESOLVED-python3-sphinx"
 ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1 = "UNRESOLVED-rti-connext-dds-5.3.1"
 ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1-native = "UNRESOLVED-rti-connext-dds-5.3.1-native"
-ROS_UNRESOLVED_PLATFORM_PKG_sdl2 = "UNRESOLVED-sdl2"
-ROS_UNRESOLVED_PLATFORM_PKG_spdlog = "UNRESOLVED-spdlog"
 ROS_UNRESOLVED_PLATFORM_PKG_uncrustify = "UNRESOLVED-uncrustify"
 
 # From the release announcement or the last field of the "<ROS_DISTRO>/YYYY-MM-DD" tag for the release in
@@ -1712,7 +1680,7 @@ ROS_SUPERFLORE_GENERATION_COMMIT = "9330a67818c6aed3cc47d6b96ceead914596ba45"
 
 # Version of scripts/ros-generate-cache.sh which was used to generate cache from which the recipes and this configuration
 # file were last generated
-ROS_GENERATE_CACHE_PROGRAM_VERSION = "1.5.3"
+ROS_GENERATE_CACHE_PROGRAM_VERSION = "1.6.0"
 
 # Version of scripts/ros-generate-recipes.sh which was used to generate recipes and this configuration file
 ROS_GENERATE_RECIPES_PROGRAM_VERSION = "1.6.0"
diff --git a/meta-ros2-rolling/files/rolling/generated/rosdep-resolve.yaml b/meta-ros2-rolling/files/rolling/generated/rosdep-resolve.yaml
index a8c89a095d7..ccfe02d1235 100644
--- a/meta-ros2-rolling/files/rolling/generated/rosdep-resolve.yaml
+++ b/meta-ros2-rolling/files/rolling/generated/rosdep-resolve.yaml
@@ -4,11 +4,11 @@ asio:
 assimp:
 - assimp@openembedded-core
 benchmark:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_benchmark}
+- google-benchmark@meta-ros2
 boost:
 - boost@openembedded-core
 bullet:
-- bullet@meta-ros
+- bullet@meta-ros-common
 bzip2:
 - bzip2@openembedded-core
 clang-format:
@@ -20,7 +20,7 @@ cmake:
 coinor-libipopt-dev:
 - ${ROS_UNRESOLVED_PLATFORM_PKG_coinor-libipopt-dev}
 cppcheck:
-- cppcheck@meta-ros
+- cppcheck@meta-ros-common
 cppunit:
 - cppunit@meta-oe
 curl:
@@ -43,21 +43,21 @@ java:
 jupyter-notebook:
 - ${ROS_UNRESOLVED_PLATFORM_PKG_jupyter-notebook}
 libboost-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev}
+- boost@openembedded-core
 libboost-iostreams-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-iostreams-dev}
+- boost@openembedded-core
 libboost-python:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-python}
+- boost@openembedded-core
 libboost-python-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-python-dev}
+- boost@openembedded-core
 libboost-system-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-system-dev}
+- boost@openembedded-core
 libcairo2-dev:
 - cairo@openembedded-core
 libceres-dev:
 - ceres-solver@meta-oe
 libconsole-bridge-dev:
-- console-bridge@meta-ros
+- console-bridge@meta-ros-common
 libcunit-dev:
 - ${ROS_UNRESOLVED_PLATFORM_PKG_libcunit-dev}
 libfreetype6:
@@ -73,17 +73,17 @@ libgoogle-glog-dev:
 libgpgme-dev:
 - gpgme@openembedded-core
 libgps:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libgps}
+- gpsd@meta-oe
 libncurses-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libncurses-dev}
+- ncurses@openembedded-core
 libogg:
 - libogg@openembedded-core
 libopencv-dev:
 - opencv@meta-oe
 libpcl-all:
-- pcl@meta-ros
+- pcl@meta-ros-common
 libpcl-all-dev:
-- pcl@meta-ros
+- pcl@meta-ros-common
 libqt5-core:
 - qtbase@meta-qt5
 libqt5-gui:
@@ -99,7 +99,7 @@ libssl-dev:
 libtheora:
 - libtheora@openembedded-core
 libusb-1.0:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libusb-1.0}
+- libusb1@openembedded-core
 libusb-1.0-dev:
 - libusb1@openembedded-core
 libx11-dev:
@@ -109,15 +109,15 @@ libxaw:
 libxml2-utils:
 - libxml2@openembedded-core
 libxmlrpc-c++:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libxmlrpc-c++}
+- xmlrpc-c@meta-oe
 libxrandr:
 - libxrandr@openembedded-core
 libzmq3-dev:
 - zeromq@meta-oe
 libzstd-dev:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_libzstd-dev}
+- zstd@meta-oe
 log4cxx:
-- log4cxx@meta-ros
+- log4cxx@meta-ros-common
 lua5.2-dev:
 - lua@meta-oe
 maven:
@@ -131,39 +131,39 @@ pkg-config:
 protobuf-dev:
 - protobuf@meta-oe
 pydocstyle:
-- ${PYTHON_PN}-pydocstyle@meta-ros
+- ${PYTHON_PN}-pydocstyle@meta-ros-common
 pyflakes3:
-- ${PYTHON_PN}-pyflakes@meta-ros
+- ${PYTHON_PN}-pyflakes@meta-ros-common
 python3-argcomplete:
 - ${ROS_UNRESOLVED_PLATFORM_PKG_python3-argcomplete}
 python3-catkin-pkg:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-catkin-pkg}
+- python3-catkin-pkg@meta-ros-common
 python3-catkin-pkg-modules:
-- python3-catkin-pkg@meta-ros
+- python3-catkin-pkg@meta-ros-common
 python3-cryptography:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-cryptography}
+- python3-cryptography@meta-python
 python3-dev:
 - python3@openembedded-core
 python3-empy:
-- python3-empy@meta-ros
+- python3-empy@meta-ros-common
 python3-flake8:
-- python3-flake8@meta-ros
+- python3-flake8@meta-ros-common
 python3-ifcfg:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-ifcfg}
+- python3-ifcfg@meta-ros-common
 python3-importlib-metadata:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-importlib-metadata}
+- python3-importlib-metadata@openembedded-core
 python3-lark-parser:
-- python3-lark-parser@meta-ros
+- python3-lark-parser@meta-ros-common
 python3-lxml:
 - python3-lxml@meta-python
 python3-matplotlib:
 - python3-matplotlib@meta-python
 python3-mock:
-- python3-mock@meta-ros
+- python3-mock@meta-ros-common
 python3-mypy:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-mypy}
+- python3-mypy@meta-ros-common
 python3-netifaces:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-netifaces}
+- python3-netifaces@meta-ros-common
 python3-nose:
 - python3-nose@openembedded-core
 python3-numpy:
@@ -177,29 +177,29 @@ python3-pkg-resources:
 python3-psutil:
 - python3-psutil@meta-python
 python3-pycodestyle:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pycodestyle}
+- python3-pycodestyle@meta-python
 python3-pydot:
-- python3-pydot@meta-ros
+- python3-pydot@meta-ros-common
 python3-pygraphviz:
-- python3-pygraphviz@meta-ros
+- python3-pygraphviz@meta-ros-common
 python3-pyproj:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pyproj}
+- python3-pyproj@meta-ros-common
 python3-pytest:
 - python3-pytest@meta-python
 python3-pytest-mock:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pytest-mock}
+- python3-pytest-mock@meta-ros-common
 python3-qt5-bindings:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-qt5-bindings}
+- python3-pyqt5@meta-qt5
 python3-requests:
 - ${ROS_UNRESOLVED_PLATFORM_PKG_python3-requests}
 python3-rosdistro-modules:
-- python3-rosdistro@meta-ros
+- python3-rosdistro@meta-ros-common
 python3-rospkg-modules:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-rospkg-modules}
+- python3-rospkg@meta-ros-common
 python3-setuptools:
 - python3-setuptools@openembedded-core
 python3-sphinx:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_python3-sphinx}
+- python3-sphinx@meta-ros-common
 python3-yaml:
 - python3-pyyaml@meta-python
 qt5-qmake:
@@ -209,12 +209,12 @@ qtbase5-dev:
 rti-connext-dds-5.3.1:
 - ${ROS_UNRESOLVED_PLATFORM_PKG_rti-connext-dds-5.3.1}
 sdl2:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_sdl2}
+- libsdl2@openembedded-core
 spdlog:
-- ${ROS_UNRESOLVED_PLATFORM_PKG_spdlog}
+- spdlog@meta-oe
 suitesparse:
-- suitesparse-cholmod@meta-ros
-- suitesparse-cxsparse@meta-ros
+- suitesparse-cholmod@meta-ros-common
+- suitesparse-cxsparse@meta-ros-common
 tinyxml:
 - libtinyxml@meta-oe
 tinyxml2:
@@ -224,4 +224,4 @@ uncrustify:
 yaml:
 - libyaml@openembedded-core
 yaml-cpp:
-- yaml-cpp@meta-ros
+- yaml-cpp@meta-ros-common
diff --git a/meta-ros2-rolling/generated-recipes/ament-lint/ament-copyright_0.10.0-1.bb b/meta-ros2-rolling/generated-recipes/ament-lint/ament-copyright_0.10.0-1.bb
index 5d08e343ef3..308bc8894d2 100644
--- a/meta-ros2-rolling/generated-recipes/ament-lint/ament-copyright_0.10.0-1.bb
+++ b/meta-ros2-rolling/generated-recipes/ament-lint/ament-copyright_0.10.0-1.bb
@@ -24,8 +24,8 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-importlib-metadata} \
     ament-lint \
+    python3-importlib-metadata \
 "
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
diff --git a/meta-ros2-rolling/generated-recipes/ament-lint/ament-mypy_0.10.0-1.bb b/meta-ros2-rolling/generated-recipes/ament-lint/ament-mypy_0.10.0-1.bb
index bd6140271cf..d1ea09aee6d 100644
--- a/meta-ros2-rolling/generated-recipes/ament-lint/ament-mypy_0.10.0-1.bb
+++ b/meta-ros2-rolling/generated-recipes/ament-lint/ament-mypy_0.10.0-1.bb
@@ -25,14 +25,14 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-mypy} \
+    python3-mypy \
 "
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
 ROS_TEST_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pytest-mock} \
     ament-flake8 \
     python3-pytest \
+    python3-pytest-mock \
 "
 
 DEPENDS = "${ROS_BUILD_DEPENDS} ${ROS_BUILDTOOL_DEPENDS}"
diff --git a/meta-ros2-rolling/generated-recipes/ament-lint/ament-pycodestyle_0.10.0-1.bb b/meta-ros2-rolling/generated-recipes/ament-lint/ament-pycodestyle_0.10.0-1.bb
index 0f381c368a5..d38927322c9 100644
--- a/meta-ros2-rolling/generated-recipes/ament-lint/ament-pycodestyle_0.10.0-1.bb
+++ b/meta-ros2-rolling/generated-recipes/ament-lint/ament-pycodestyle_0.10.0-1.bb
@@ -24,7 +24,7 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pycodestyle} \
+    python3-pycodestyle \
 "
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
diff --git a/meta-ros2-rolling/generated-recipes/behaviortree-cpp/behaviortree-cpp-v3_3.5.0-2.bb b/meta-ros2-rolling/generated-recipes/behaviortree-cpp/behaviortree-cpp-v3_3.5.0-2.bb
index a12b831b05a..da0b6761bbe 100644
--- a/meta-ros2-rolling/generated-recipes/behaviortree-cpp/behaviortree-cpp-v3_3.5.0-2.bb
+++ b/meta-ros2-rolling/generated-recipes/behaviortree-cpp/behaviortree-cpp-v3_3.5.0-2.bb
@@ -17,7 +17,7 @@ ROS_CN = "behaviortree_cpp"
 ROS_BPN = "behaviortree_cpp_v3"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libncurses-dev} \
+    ncurses \
     rclcpp \
     zeromq \
 "
@@ -27,7 +27,7 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libncurses-dev} \
+    ncurses \
     rclcpp \
     zeromq \
 "
@@ -35,7 +35,7 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libncurses-dev} \
+    ncurses \
     rclcpp \
     zeromq \
 "
diff --git a/meta-ros2-rolling/generated-recipes/cartographer/cartographer_1.0.9001-2.bb b/meta-ros2-rolling/generated-recipes/cartographer/cartographer_1.0.9001-2.bb
index 3db8950c0d3..ce49631404b 100644
--- a/meta-ros2-rolling/generated-recipes/cartographer/cartographer_1.0.9001-2.bb
+++ b/meta-ros2-rolling/generated-recipes/cartographer/cartographer_1.0.9001-2.bb
@@ -17,8 +17,7 @@ ROS_CN = "cartographer"
 ROS_BPN = "cartographer"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-iostreams-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-sphinx} \
+    boost \
     cairo \
     ceres-solver \
     gflags \
@@ -27,6 +26,7 @@ ROS_BUILD_DEPENDS = " \
     libeigen \
     lua \
     protobuf \
+    python3-sphinx \
 "
 
 ROS_BUILDTOOL_DEPENDS = " \
@@ -34,7 +34,7 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-iostreams-dev} \
+    boost \
     cairo \
     ceres-solver \
     gflags \
@@ -47,7 +47,7 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-iostreams-dev} \
+    boost \
     cairo \
     ceres-solver \
     gflags \
diff --git a/meta-ros2-rolling/generated-recipes/filters/filters_2.0.0-2.bb b/meta-ros2-rolling/generated-recipes/filters/filters_2.0.0-2.bb
index 72fdebfd8b4..502d30e0c07 100644
--- a/meta-ros2-rolling/generated-recipes/filters/filters_2.0.0-2.bb
+++ b/meta-ros2-rolling/generated-recipes/filters/filters_2.0.0-2.bb
@@ -16,7 +16,7 @@ ROS_CN = "filters"
 ROS_BPN = "filters"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
+    boost \
     pluginlib \
     rclcpp \
 "
@@ -26,7 +26,7 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
+    boost \
     pluginlib \
     rclcpp \
 "
@@ -34,7 +34,7 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
+    boost \
     pluginlib \
     rclcpp \
 "
diff --git a/meta-ros2-rolling/generated-recipes/geographic-info/geodesy_1.0.4-2.bb b/meta-ros2-rolling/generated-recipes/geographic-info/geodesy_1.0.4-2.bb
index 7e653bf7986..3dddedc2eec 100644
--- a/meta-ros2-rolling/generated-recipes/geographic-info/geodesy_1.0.4-2.bb
+++ b/meta-ros2-rolling/generated-recipes/geographic-info/geodesy_1.0.4-2.bb
@@ -17,11 +17,11 @@ ROS_CN = "geographic_info"
 ROS_BPN = "geodesy"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-catkin-pkg} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pyproj} \
     angles \
     geographic-msgs \
     geometry-msgs \
+    python3-catkin-pkg \
+    python3-pyproj \
     sensor-msgs \
     unique-identifier-msgs \
 "
@@ -31,10 +31,10 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pyproj} \
     angles \
     geographic-msgs \
     geometry-msgs \
+    python3-pyproj \
     sensor-msgs \
     unique-identifier-msgs \
 "
@@ -42,10 +42,10 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pyproj} \
     angles \
     geographic-msgs \
     geometry-msgs \
+    python3-pyproj \
     sensor-msgs \
     unique-identifier-msgs \
 "
diff --git a/meta-ros2-rolling/generated-recipes/google-benchmark-vendor/google-benchmark-vendor_0.0.3-1.bb b/meta-ros2-rolling/generated-recipes/google-benchmark-vendor/google-benchmark-vendor_0.0.3-1.bb
index 840fd871aa9..6d54c70d5d9 100644
--- a/meta-ros2-rolling/generated-recipes/google-benchmark-vendor/google-benchmark-vendor_0.0.3-1.bb
+++ b/meta-ros2-rolling/generated-recipes/google-benchmark-vendor/google-benchmark-vendor_0.0.3-1.bb
@@ -16,7 +16,7 @@ ROS_CN = "google_benchmark_vendor"
 ROS_BPN = "google_benchmark_vendor"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_benchmark} \
+    google-benchmark \
 "
 
 ROS_BUILDTOOL_DEPENDS = " \
@@ -24,13 +24,13 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_benchmark} \
+    google-benchmark \
 "
 
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_benchmark} \
+    google-benchmark \
 "
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
diff --git a/meta-ros2-rolling/generated-recipes/gps-umd/gpsd-client_1.0.3-2.bb b/meta-ros2-rolling/generated-recipes/gps-umd/gpsd-client_1.0.3-2.bb
index fc064b2db08..42b8f5c51c0 100644
--- a/meta-ros2-rolling/generated-recipes/gps-umd/gpsd-client_1.0.3-2.bb
+++ b/meta-ros2-rolling/generated-recipes/gps-umd/gpsd-client_1.0.3-2.bb
@@ -17,8 +17,8 @@ ROS_CN = "gps_umd"
 ROS_BPN = "gpsd_client"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libgps} \
     gps-msgs \
+    gpsd \
     pkgconfig \
     rclcpp \
     rclcpp-components \
@@ -30,8 +30,8 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libgps} \
     gps-msgs \
+    gpsd \
     pkgconfig \
     rclcpp \
     rclcpp-components \
@@ -41,8 +41,8 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libgps} \
     gps-msgs \
+    gpsd \
     pkgconfig \
     rclcpp \
     rclcpp-components \
diff --git a/meta-ros2-rolling/generated-recipes/ifm3d-core/ifm3d-core_0.18.0-5.bb b/meta-ros2-rolling/generated-recipes/ifm3d-core/ifm3d-core_0.18.0-5.bb
index bfcf497032b..899d9c5d7d0 100644
--- a/meta-ros2-rolling/generated-recipes/ifm3d-core/ifm3d-core_0.18.0-5.bb
+++ b/meta-ros2-rolling/generated-recipes/ifm3d-core/ifm3d-core_0.18.0-5.bb
@@ -17,12 +17,12 @@ ROS_CN = "ifm3d_core"
 ROS_BPN = "ifm3d_core"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libxmlrpc-c++} \
     boost \
     curl \
     cv-bridge \
     glog \
     pcl \
+    xmlrpc-c \
 "
 
 ROS_BUILDTOOL_DEPENDS = " \
@@ -34,11 +34,11 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libxmlrpc-c++} \
     curl \
     cv-bridge \
     glog \
     pcl \
+    xmlrpc-c \
 "
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
diff --git a/meta-ros2-rolling/generated-recipes/image-pipeline/image-view_2.2.1-1.bb b/meta-ros2-rolling/generated-recipes/image-pipeline/image-view_2.2.1-1.bb
index 5f728758ff6..63f600ad022 100644
--- a/meta-ros2-rolling/generated-recipes/image-pipeline/image-view_2.2.1-1.bb
+++ b/meta-ros2-rolling/generated-recipes/image-pipeline/image-view_2.2.1-1.bb
@@ -17,7 +17,7 @@ ROS_CN = "image_pipeline"
 ROS_BPN = "image_view"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
+    boost \
     camera-calibration-parsers \
     cv-bridge \
     image-transport \
@@ -34,7 +34,7 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
+    boost \
     camera-calibration-parsers \
     cv-bridge \
     image-transport \
@@ -49,7 +49,7 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
+    boost \
     camera-calibration-parsers \
     cv-bridge \
     image-transport \
diff --git a/meta-ros2-rolling/generated-recipes/joystick-drivers/sdl2-vendor_2.4.1-2.bb b/meta-ros2-rolling/generated-recipes/joystick-drivers/sdl2-vendor_2.4.1-2.bb
index 93625e9ba5d..8a3335b589f 100644
--- a/meta-ros2-rolling/generated-recipes/joystick-drivers/sdl2-vendor_2.4.1-2.bb
+++ b/meta-ros2-rolling/generated-recipes/joystick-drivers/sdl2-vendor_2.4.1-2.bb
@@ -16,7 +16,7 @@ ROS_CN = "joystick_drivers"
 ROS_BPN = "sdl2_vendor"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_sdl2} \
+    libsdl2 \
 "
 
 ROS_BUILDTOOL_DEPENDS = " \
@@ -24,13 +24,13 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_sdl2} \
+    libsdl2 \
 "
 
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_sdl2} \
+    libsdl2 \
 "
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
diff --git a/meta-ros2-rolling/generated-recipes/launch/launch_0.12.0-1.bb b/meta-ros2-rolling/generated-recipes/launch/launch_0.12.0-1.bb
index 0506e91b7b6..5c96ba6897b 100644
--- a/meta-ros2-rolling/generated-recipes/launch/launch_0.12.0-1.bb
+++ b/meta-ros2-rolling/generated-recipes/launch/launch_0.12.0-1.bb
@@ -28,9 +28,9 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-importlib-metadata} \
     ament-index-python \
     osrf-pycommon \
+    python3-importlib-metadata \
     python3-lark-parser \
 "
 
diff --git a/meta-ros2-rolling/generated-recipes/nodl/nodl-python_0.1.0-2.bb b/meta-ros2-rolling/generated-recipes/nodl/nodl-python_0.1.0-2.bb
index 4cd921eeb4c..cfb1c35decd 100644
--- a/meta-ros2-rolling/generated-recipes/nodl/nodl-python_0.1.0-2.bb
+++ b/meta-ros2-rolling/generated-recipes/nodl/nodl-python_0.1.0-2.bb
@@ -39,12 +39,12 @@ ROS_EXEC_DEPENDS = " \
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
 ROS_TEST_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pytest-mock} \
     ament-flake8 \
     ament-lint-auto \
     ament-lint-common \
     ament-mypy \
     python3-pytest \
+    python3-pytest-mock \
 "
 
 DEPENDS = "${ROS_BUILD_DEPENDS} ${ROS_BUILDTOOL_DEPENDS}"
diff --git a/meta-ros2-rolling/generated-recipes/nodl/ros2nodl_0.1.0-2.bb b/meta-ros2-rolling/generated-recipes/nodl/ros2nodl_0.1.0-2.bb
index c23b4c8819d..baabf216dc0 100644
--- a/meta-ros2-rolling/generated-recipes/nodl/ros2nodl_0.1.0-2.bb
+++ b/meta-ros2-rolling/generated-recipes/nodl/ros2nodl_0.1.0-2.bb
@@ -48,12 +48,12 @@ ROS_EXEC_DEPENDS = " \
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
 ROS_TEST_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-pytest-mock} \
     ament-flake8 \
     ament-lint-auto \
     ament-lint-common \
     ament-mypy \
     python3-pytest \
+    python3-pytest-mock \
 "
 
 DEPENDS = "${ROS_BUILD_DEPENDS} ${ROS_BUILDTOOL_DEPENDS}"
diff --git a/meta-ros2-rolling/generated-recipes/phidgets-drivers/libphidget22_2.0.2-2.bb b/meta-ros2-rolling/generated-recipes/phidgets-drivers/libphidget22_2.0.2-2.bb
index 3fffd06b97b..72d5ded9ce6 100644
--- a/meta-ros2-rolling/generated-recipes/phidgets-drivers/libphidget22_2.0.2-2.bb
+++ b/meta-ros2-rolling/generated-recipes/phidgets-drivers/libphidget22_2.0.2-2.bb
@@ -29,7 +29,7 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libusb-1.0} \
+    libusb1 \
 "
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
diff --git a/meta-ros2-rolling/generated-recipes/python-qt-binding/python-qt-binding_1.0.5-2.bb b/meta-ros2-rolling/generated-recipes/python-qt-binding/python-qt-binding_1.0.5-2.bb
index 9911fec542b..aebc06b1442 100644
--- a/meta-ros2-rolling/generated-recipes/python-qt-binding/python-qt-binding_1.0.5-2.bb
+++ b/meta-ros2-rolling/generated-recipes/python-qt-binding/python-qt-binding_1.0.5-2.bb
@@ -17,7 +17,7 @@ ROS_CN = "python_qt_binding"
 ROS_BPN = "python_qt_binding"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-qt5-bindings} \
+    python3-pyqt5 \
     qtbase \
 "
 
@@ -30,7 +30,7 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-qt5-bindings} \
+    python3-pyqt5 \
 "
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
diff --git a/meta-ros2-rolling/generated-recipes/qt-gui-core/qt-gui_1.1.2-2.bb b/meta-ros2-rolling/generated-recipes/qt-gui-core/qt-gui_1.1.2-2.bb
index 5f665341284..cb50021e1dd 100644
--- a/meta-ros2-rolling/generated-recipes/qt-gui-core/qt-gui_1.1.2-2.bb
+++ b/meta-ros2-rolling/generated-recipes/qt-gui-core/qt-gui_1.1.2-2.bb
@@ -17,7 +17,7 @@ ROS_CN = "qt_gui_core"
 ROS_BPN = "qt_gui"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-qt5-bindings} \
+    python3-pyqt5 \
     qtbase \
 "
 
diff --git a/meta-ros2-rolling/generated-recipes/rcl-logging/rcl-logging-spdlog_2.0.1-1.bb b/meta-ros2-rolling/generated-recipes/rcl-logging/rcl-logging-spdlog_2.0.1-1.bb
index 3a35a1640f1..468175cb01e 100644
--- a/meta-ros2-rolling/generated-recipes/rcl-logging/rcl-logging-spdlog_2.0.1-1.bb
+++ b/meta-ros2-rolling/generated-recipes/rcl-logging/rcl-logging-spdlog_2.0.1-1.bb
@@ -17,9 +17,9 @@ ROS_CN = "rcl_logging"
 ROS_BPN = "rcl_logging_spdlog"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_spdlog} \
     rcl-logging-interface \
     rcutils \
+    spdlog \
     spdlog-vendor \
 "
 
@@ -35,9 +35,9 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_spdlog} \
     rcl-logging-interface \
     rcutils \
+    spdlog \
     spdlog-vendor \
 "
 
diff --git a/meta-ros2-rolling/generated-recipes/ros2cli/ros2cli_0.9.5-2.bb b/meta-ros2-rolling/generated-recipes/ros2cli/ros2cli_0.9.5-2.bb
index 03a2276d921..0960f7c9322 100644
--- a/meta-ros2-rolling/generated-recipes/ros2cli/ros2cli_0.9.5-2.bb
+++ b/meta-ros2-rolling/generated-recipes/ros2cli/ros2cli_0.9.5-2.bb
@@ -24,7 +24,7 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-netifaces} \
+    python3-netifaces \
     python3-setuptools \
     rclpy \
 "
diff --git a/meta-ros2-rolling/generated-recipes/ros2cli/ros2doctor_0.9.5-2.bb b/meta-ros2-rolling/generated-recipes/ros2cli/ros2doctor_0.9.5-2.bb
index 8228c049af8..9428a9c0d52 100644
--- a/meta-ros2-rolling/generated-recipes/ros2cli/ros2doctor_0.9.5-2.bb
+++ b/meta-ros2-rolling/generated-recipes/ros2cli/ros2doctor_0.9.5-2.bb
@@ -28,9 +28,9 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-ifcfg} \
     ament-index-python \
     python3-catkin-pkg \
+    python3-ifcfg \
     python3-rosdistro \
     rclpy \
     ros2cli \
diff --git a/meta-ros2-rolling/generated-recipes/rosbag2/zstd-vendor_0.3.2-2.bb b/meta-ros2-rolling/generated-recipes/rosbag2/zstd-vendor_0.3.2-2.bb
index afb0d44c0c0..6c81ae7874a 100644
--- a/meta-ros2-rolling/generated-recipes/rosbag2/zstd-vendor_0.3.2-2.bb
+++ b/meta-ros2-rolling/generated-recipes/rosbag2/zstd-vendor_0.3.2-2.bb
@@ -16,7 +16,7 @@ ROS_CN = "rosbag2"
 ROS_BPN = "zstd_vendor"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libzstd-dev} \
+    zstd \
 "
 
 ROS_BUILDTOOL_DEPENDS = " \
@@ -24,13 +24,13 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libzstd-dev} \
+    zstd \
 "
 
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libzstd-dev} \
+    zstd \
 "
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
diff --git a/meta-ros2-rolling/generated-recipes/rqt-robot-monitor/rqt-robot-monitor_1.0.3-1.bb b/meta-ros2-rolling/generated-recipes/rqt-robot-monitor/rqt-robot-monitor_1.0.3-1.bb
index 03cd599beec..65e1c131e09 100644
--- a/meta-ros2-rolling/generated-recipes/rqt-robot-monitor/rqt-robot-monitor_1.0.3-1.bb
+++ b/meta-ros2-rolling/generated-recipes/rqt-robot-monitor/rqt-robot-monitor_1.0.3-1.bb
@@ -27,9 +27,9 @@ ROS_EXPORT_DEPENDS = ""
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-rospkg-modules} \
     diagnostic-msgs \
     python-qt-binding \
+    python3-rospkg \
     qt-gui \
     qt-gui-py-common \
     rclpy \
diff --git a/meta-ros2-rolling/generated-recipes/spdlog-vendor/spdlog-vendor_1.1.2-2.bb b/meta-ros2-rolling/generated-recipes/spdlog-vendor/spdlog-vendor_1.1.2-2.bb
index f75c40f11b3..a00d45b3d4d 100644
--- a/meta-ros2-rolling/generated-recipes/spdlog-vendor/spdlog-vendor_1.1.2-2.bb
+++ b/meta-ros2-rolling/generated-recipes/spdlog-vendor/spdlog-vendor_1.1.2-2.bb
@@ -16,7 +16,7 @@ ROS_CN = "spdlog_vendor"
 ROS_BPN = "spdlog_vendor"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_spdlog} \
+    spdlog \
 "
 
 ROS_BUILDTOOL_DEPENDS = " \
@@ -24,13 +24,13 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_spdlog} \
+    spdlog \
 "
 
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_spdlog} \
+    spdlog \
 "
 
 # Currently informational only -- see http://www.ros.org/reps/rep-0149.html#dependency-tags.
diff --git a/meta-ros2-rolling/generated-recipes/sros2/sros2_0.9.2-2.bb b/meta-ros2-rolling/generated-recipes/sros2/sros2_0.9.2-2.bb
index 41162d8d740..0fe0fa89325 100644
--- a/meta-ros2-rolling/generated-recipes/sros2/sros2_0.9.2-2.bb
+++ b/meta-ros2-rolling/generated-recipes/sros2/sros2_0.9.2-2.bb
@@ -31,8 +31,8 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_python3-cryptography} \
     ament-index-python \
+    python3-cryptography \
     python3-lxml \
     rclpy \
     ros2cli \
diff --git a/meta-ros2-rolling/generated-recipes/transport-drivers/serial-driver_0.0.6-1.bb b/meta-ros2-rolling/generated-recipes/transport-drivers/serial-driver_0.0.6-1.bb
index 308f481573b..2762717a241 100644
--- a/meta-ros2-rolling/generated-recipes/transport-drivers/serial-driver_0.0.6-1.bb
+++ b/meta-ros2-rolling/generated-recipes/transport-drivers/serial-driver_0.0.6-1.bb
@@ -17,8 +17,7 @@ ROS_CN = "transport_drivers"
 ROS_BPN = "serial_driver"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-system-dev} \
+    boost \
     rclcpp \
     std-msgs \
 "
@@ -28,8 +27,7 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-system-dev} \
+    boost \
     rclcpp \
     std-msgs \
 "
@@ -37,8 +35,7 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-system-dev} \
+    boost \
     rclcpp \
     std-msgs \
 "
diff --git a/meta-ros2-rolling/generated-recipes/transport-drivers/udp-driver_0.0.6-1.bb b/meta-ros2-rolling/generated-recipes/transport-drivers/udp-driver_0.0.6-1.bb
index 63265583910..b45a8a40bb1 100644
--- a/meta-ros2-rolling/generated-recipes/transport-drivers/udp-driver_0.0.6-1.bb
+++ b/meta-ros2-rolling/generated-recipes/transport-drivers/udp-driver_0.0.6-1.bb
@@ -17,8 +17,7 @@ ROS_CN = "transport_drivers"
 ROS_BPN = "udp_driver"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-system-dev} \
+    boost \
     rclcpp \
     std-msgs \
 "
@@ -28,8 +27,7 @@ ROS_BUILDTOOL_DEPENDS = " \
 "
 
 ROS_EXPORT_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-system-dev} \
+    boost \
     rclcpp \
     std-msgs \
 "
@@ -37,8 +35,7 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-system-dev} \
+    boost \
     rclcpp \
     std-msgs \
 "
diff --git a/meta-ros2-rolling/generated-recipes/vision-opencv/cv-bridge_2.2.1-1.bb b/meta-ros2-rolling/generated-recipes/vision-opencv/cv-bridge_2.2.1-1.bb
index e0ddc80b6d1..49f42d68ae8 100644
--- a/meta-ros2-rolling/generated-recipes/vision-opencv/cv-bridge_2.2.1-1.bb
+++ b/meta-ros2-rolling/generated-recipes/vision-opencv/cv-bridge_2.2.1-1.bb
@@ -17,8 +17,7 @@ ROS_CN = "vision_opencv"
 ROS_BPN = "cv_bridge"
 
 ROS_BUILD_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-dev} \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-python-dev} \
+    boost \
     opencv \
     python3-numpy \
     sensor-msgs \
@@ -38,8 +37,8 @@ ROS_EXPORT_DEPENDS = " \
 ROS_BUILDTOOL_EXPORT_DEPENDS = ""
 
 ROS_EXEC_DEPENDS = " \
-    ${ROS_UNRESOLVED_PLATFORM_PKG_libboost-python} \
     ament-index-python \
+    boost \
     opencv \
     python3-numpy \
     sensor-msgs \