diff --git a/patch/ros-jazzy-rviz-ogre-vendor.patch b/patch/ros-jazzy-rviz-ogre-vendor.patch
new file mode 100644
index 000000000..56f88875b
--- /dev/null
+++ b/patch/ros-jazzy-rviz-ogre-vendor.patch
@@ -0,0 +1,27 @@
+diff --git a/patches/0005-fix-arm64.patch b/patches/0005-fix-arm64.patch
+new file mode 100644
+index 000000000..e4e44916c
+--- /dev/null
++++ b/patches/0005-fix-arm64.patch
+@@ -0,0 +1,20 @@
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index f4d8fd4..ffae9c8 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -270,14 +270,6 @@ elseif(EMSCRIPTEN)
++   set(OGRE_CONFIG_THREADS "0" CACHE STRING "Threading is unstable on Emscripten" FORCE)
++ elseif (APPLE AND NOT APPLE_IOS)
++ 
++-  set(XCODE_ATTRIBUTE_SDKROOT macosx)
++-  if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
++-    execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)
++-    string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
++-  else()
++-    set(CMAKE_OSX_SYSROOT macosx)
++-  endif()
++-
++   # Make sure that the OpenGL render system is selected for non-iOS Apple builds
++   set(OGRE_BUILD_RENDERSYSTEM_GLES2 FALSE)
++ endif ()
++-- 
+-- 
diff --git a/vinca_osx.yaml b/vinca_osx.yaml
index eeb00ffbb..de272edd5 100644
--- a/vinca_osx.yaml
+++ b/vinca_osx.yaml
@@ -17,22 +17,30 @@ full_rebuild: true
 
 packages_skip_by_deps:
   - cartographer
-  - octomap
+  - pcl_conversions
+  - pendulum_control
+  - rqt_common_plugins
+  - rttest
+  - tlsf
+  - tlsf_cpp
 
 packages_remove_from_deps:
   - cartographer
-  - octomap
-  - warehouse_ros_mongo
+  - pcl_conversions
+  - pendulum_control
+  - rqt_common_plugins
+  - rttest
+  - tlsf
+  - tlsf_cpp
 
 skip_existing:
   - https://conda.anaconda.org/robostack-jazzy/
 
 packages_select_by_deps:
+  - ament_cmake_core
   - ros_workspace
   - ros_environment
   - ros_base
-  # - desktop
-
+  - desktop
 
 patch_dir: patch
-
diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
index eeb00ffbb..de272edd5 100644
--- a/vinca_osx_arm64.yaml
+++ b/vinca_osx_arm64.yaml
@@ -17,22 +17,30 @@ full_rebuild: true
 
 packages_skip_by_deps:
   - cartographer
-  - octomap
+  - pcl_conversions
+  - pendulum_control
+  - rqt_common_plugins
+  - rttest
+  - tlsf
+  - tlsf_cpp
 
 packages_remove_from_deps:
   - cartographer
-  - octomap
-  - warehouse_ros_mongo
+  - pcl_conversions
+  - pendulum_control
+  - rqt_common_plugins
+  - rttest
+  - tlsf
+  - tlsf_cpp
 
 skip_existing:
   - https://conda.anaconda.org/robostack-jazzy/
 
 packages_select_by_deps:
+  - ament_cmake_core
   - ros_workspace
   - ros_environment
   - ros_base
-  # - desktop
-
+  - desktop
 
 patch_dir: patch
-