diff --git a/files/ros1-melodic-gatesgarth.mcf b/files/ros1-melodic-gatesgarth.mcf
index 97dbdaf55d8..280324dc43a 100644
--- a/files/ros1-melodic-gatesgarth.mcf
+++ b/files/ros1-melodic-gatesgarth.mcf
@@ -59,7 +59,7 @@ MetaRos_Commit  = getenv('MCF_META_ROS_COMMIT',   'a2126a3e8')
 # Note that the github.com/openembedded repositories are read-only mirrors of
 # the authoritative repositories on git.openembedded.org .
 Layers = [
-('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': 'a1987f24'},          {}),
+('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': '247aaf02'},          {}),
 
 ('meta',                                5, 'git://github.com/openembedded/openembedded-core.git',    {'branch': OE_Branch,            'commit': 'd47b7cdc35'},        {}),
 
diff --git a/files/ros1-noetic-gatesgarth.mcf b/files/ros1-noetic-gatesgarth.mcf
index 6372bc4324d..98ef3d4bb02 100644
--- a/files/ros1-noetic-gatesgarth.mcf
+++ b/files/ros1-noetic-gatesgarth.mcf
@@ -59,7 +59,7 @@ MetaRos_Commit  = getenv('MCF_META_ROS_COMMIT',   'a2126a3e8')
 # Note that the github.com/openembedded repositories are read-only mirrors of
 # the authoritative repositories on git.openembedded.org .
 Layers = [
-('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': 'a1987f24'},          {}),
+('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': '247aaf02'},          {}),
 
 ('meta',                                5, 'git://github.com/openembedded/openembedded-core.git',    {'branch': OE_Branch,            'commit': 'd47b7cdc35'},        {}),
 
diff --git a/files/ros2-dashing-gatesgarth.mcf b/files/ros2-dashing-gatesgarth.mcf
index 51ef798c999..f8e6b9b68a3 100644
--- a/files/ros2-dashing-gatesgarth.mcf
+++ b/files/ros2-dashing-gatesgarth.mcf
@@ -59,7 +59,7 @@ MetaRos_Commit  = getenv('MCF_META_ROS_COMMIT',   'a2126a3e8')
 # Note that the github.com/openembedded repositories are read-only mirrors of
 # the authoritative repositories on git.openembedded.org .
 Layers = [
-('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': 'a1987f24'},          {}),
+('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': '247aaf02'},          {}),
 
 ('meta',                                5, 'git://github.com/openembedded/openembedded-core.git',    {'branch': OE_Branch,            'commit': 'd47b7cdc35'},        {}),
 
diff --git a/files/ros2-eloquent-gatesgarth.mcf b/files/ros2-eloquent-gatesgarth.mcf
index 7c7ed80a68c..2ba51a700de 100644
--- a/files/ros2-eloquent-gatesgarth.mcf
+++ b/files/ros2-eloquent-gatesgarth.mcf
@@ -59,7 +59,7 @@ MetaRos_Commit  = getenv('MCF_META_ROS_COMMIT',   'a2126a3e8')
 # Note that the github.com/openembedded repositories are read-only mirrors of
 # the authoritative repositories on git.openembedded.org .
 Layers = [
-('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': 'a1987f24'},          {}),
+('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': '247aaf02'},          {}),
 
 ('meta',                                5, 'git://github.com/openembedded/openembedded-core.git',    {'branch': OE_Branch,            'commit': 'd47b7cdc35'},        {}),
 
diff --git a/files/ros2-foxy-gatesgarth.mcf b/files/ros2-foxy-gatesgarth.mcf
index e59113231b3..fe130ee8785 100644
--- a/files/ros2-foxy-gatesgarth.mcf
+++ b/files/ros2-foxy-gatesgarth.mcf
@@ -59,7 +59,7 @@ MetaRos_Commit  = getenv('MCF_META_ROS_COMMIT',   'a2126a3e8')
 # Note that the github.com/openembedded repositories are read-only mirrors of
 # the authoritative repositories on git.openembedded.org .
 Layers = [
-('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': 'a1987f24'},          {}),
+('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': '247aaf02'},          {}),
 
 ('meta',                                5, 'git://github.com/openembedded/openembedded-core.git',    {'branch': OE_Branch,            'commit': 'd47b7cdc35'},        {}),
 
diff --git a/files/ros2-galactic-gatesgarth.mcf b/files/ros2-galactic-gatesgarth.mcf
index c9466237d8e..e9e20234b32 100644
--- a/files/ros2-galactic-gatesgarth.mcf
+++ b/files/ros2-galactic-gatesgarth.mcf
@@ -59,7 +59,7 @@ MetaRos_Commit  = getenv('MCF_META_ROS_COMMIT',   'a2126a3e8')
 # Note that the github.com/openembedded repositories are read-only mirrors of
 # the authoritative repositories on git.openembedded.org .
 Layers = [
-('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': 'a1987f24'},          {}),
+('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': '247aaf02'},          {}),
 
 ('meta',                                5, 'git://github.com/openembedded/openembedded-core.git',    {'branch': OE_Branch,            'commit': 'd47b7cdc35'},        {}),
 
diff --git a/files/ros2-rolling-gatesgarth.mcf b/files/ros2-rolling-gatesgarth.mcf
index 431281c3efa..4cfa21be26d 100644
--- a/files/ros2-rolling-gatesgarth.mcf
+++ b/files/ros2-rolling-gatesgarth.mcf
@@ -59,7 +59,7 @@ MetaRos_Commit  = getenv('MCF_META_ROS_COMMIT',   'a2126a3e8')
 # Note that the github.com/openembedded repositories are read-only mirrors of
 # the authoritative repositories on git.openembedded.org .
 Layers = [
-('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': 'a1987f24'},          {}),
+('bitbake',                            -1, 'git://github.com/openembedded/bitbake.git',              {'branch': Bitbake_Branch,       'commit': '247aaf02'},          {}),
 
 ('meta',                                5, 'git://github.com/openembedded/openembedded-core.git',    {'branch': OE_Branch,            'commit': 'd47b7cdc35'},        {}),