diff --git a/distros/jazzy/overrides.nix b/distros/jazzy/overrides.nix
index d9b2f1e271..25e1cd498e 100644
--- a/distros/jazzy/overrides.nix
+++ b/distros/jazzy/overrides.nix
@@ -195,6 +195,28 @@ in {
     hash = "sha256-Qaz26F11VWxkQH8HfgVJLTHbHwmeByQu8ENkuyk5rPE=";
   };
 
+  moveit-core = rosSuper.moveit-core.overrideAttrs ({
+    postPatch ? "", ...
+  }: {
+    # Remove workaround for Ubuntu-specific dependency hell issue
+    postPatch = postPatch + ''
+      substituteInPlace CMakeLists.txt --replace-fail \
+        'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
+        'find_package(octomap REQUIRED)'
+    '';
+  });
+
+  moveit-ros-occupancy-map-monitor = rosSuper.moveit-ros-occupancy-map-monitor.overrideAttrs ({
+    postPatch ? "", ...
+  }: {
+    # Remove workaround for Ubuntu-specific dependency hell issue
+    postPatch = postPatch + ''
+      substituteInPlace CMakeLists.txt --replace-fail \
+        'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
+        'find_package(octomap REQUIRED)'
+    '';
+  });
+
   rviz-ogre-vendor = lib.patchAmentVendorGit rosSuper.rviz-ogre-vendor {
     url = "https://github.com/OGRECave/ogre.git";
     rev = "v1.12.10";
diff --git a/distros/rolling/overrides.nix b/distros/rolling/overrides.nix
index 2c8addbe22..2654f97024 100644
--- a/distros/rolling/overrides.nix
+++ b/distros/rolling/overrides.nix
@@ -195,6 +195,28 @@ in {
     hash = "sha256-ZP8+URGfN//Pr53uy9mHp8tNTZA110o/03czlaRw/aE=";
   };
 
+  moveit-core = rosSuper.moveit-core.overrideAttrs ({
+    postPatch ? "", ...
+  }: {
+    # Remove workaround for Ubuntu-specific dependency hell issue
+    postPatch = postPatch + ''
+      substituteInPlace CMakeLists.txt --replace-fail \
+        'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
+        'find_package(octomap REQUIRED)'
+    '';
+  });
+
+  moveit-ros-occupancy-map-monitor = rosSuper.moveit-ros-occupancy-map-monitor.overrideAttrs ({
+    postPatch ? "", ...
+  }: {
+    # Remove workaround for Ubuntu-specific dependency hell issue
+    postPatch = postPatch + ''
+      substituteInPlace CMakeLists.txt --replace-fail \
+        'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
+        'find_package(octomap REQUIRED)'
+    '';
+  });
+
   nlohmann-json-schema-validator-vendor = lib.patchExternalProjectGit rosSuper.nlohmann-json-schema-validator-vendor {
     url = "https://github.com/pboettch/json-schema-validator.git";
     rev = "5ef4f903af055550e06955973a193e17efded896";
diff --git a/distros/ros2-overlay.nix b/distros/ros2-overlay.nix
index a817cfcbff..ad12004df5 100644
--- a/distros/ros2-overlay.nix
+++ b/distros/ros2-overlay.nix
@@ -112,28 +112,6 @@ rosSelf: rosSuper: with rosSelf.lib; {
     '';
   });
 
-  moveit-core = rosSuper.moveit-core.overrideAttrs ({
-    postPatch ? "", ...
-  }: {
-    # Remove workaround for Ubuntu-specific dependency hell issue
-    postPatch = postPatch + ''
-      substituteInPlace CMakeLists.txt --replace-fail \
-        'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
-        'find_package(octomap REQUIRED)'
-    '';
-  });
-
-  moveit-ros-occupancy-map-monitor = rosSuper.moveit-ros-occupancy-map-monitor.overrideAttrs ({
-    postPatch ? "", ...
-  }: {
-    # Remove workaround for Ubuntu-specific dependency hell issue
-    postPatch = postPatch + ''
-      substituteInPlace CMakeLists.txt --replace-fail \
-        'find_package(octomap 1.9.7...<1.10.0 REQUIRED)' \
-        'find_package(octomap REQUIRED)'
-    '';
-  });
-
   popf = rosSuper.popf.overrideAttrs ({
     nativeBuildInputs ? [], postPatch ? "", ...
   }: {