diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
index ab267585..618f9428 100644
--- a/.ci_support/linux_64_.yaml
+++ b/.ci_support/linux_64_.yaml
@@ -39,7 +39,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 libuuid:
 - '2'
 libxcb:
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
index 66d90b31..5ce8d6df 100644
--- a/.ci_support/linux_aarch64_.yaml
+++ b/.ci_support/linux_aarch64_.yaml
@@ -43,7 +43,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 libuuid:
 - '2'
 libxcb:
diff --git a/.ci_support/migrations/libprotobuf4251.yaml b/.ci_support/migrations/libprotobuf4251.yaml
new file mode 100644
index 00000000..39478f0d
--- /dev/null
+++ b/.ci_support/migrations/libprotobuf4251.yaml
@@ -0,0 +1,10 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libprotobuf 4.25.1
+  kind: version
+  migration_number: 1
+libgrpc:
+- "1.60"
+libprotobuf:
+- 4.25.1
+migrator_ts: 1705841975.2201185
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
index 52c51bd0..b1223677 100644
--- a/.ci_support/osx_64_.yaml
+++ b/.ci_support/osx_64_.yaml
@@ -39,7 +39,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 libxcb:
 - '1.15'
 macos_machine:
diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
index ac660929..ddb1b997 100644
--- a/.ci_support/osx_arm64_.yaml
+++ b/.ci_support/osx_arm64_.yaml
@@ -39,7 +39,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 libxcb:
 - '1.15'
 macos_machine:
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
index d38a14fc..82088862 100644
--- a/.ci_support/win_64_.yaml
+++ b/.ci_support/win_64_.yaml
@@ -29,7 +29,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 pin_run_as_build:
   graphviz:
     max_pin: x
diff --git a/.gitignore b/.gitignore
index c0029107..179afe55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,22 @@
 # Everything else is managed by the conda-smithy rerender process.
 # Please do not modify
 
+# Ignore all files and folders in root
 *
 !/conda-forge.yml
 
-!/*/
+# Don't ignore any files/folders if the parent folder is 'un-ignored'
+# This also avoids warnings when adding an already-checked file with an ignored parent.
+!/**/
+# Don't ignore any files/folders recursively in the following folders
 !/recipe/**
 !/.ci_support/**
 
+# Since we ignore files/folders recursively, any folders inside
+# build_artifacts gets ignored which trips some build systems.
+# To avoid that we 'un-ignore' all files/folders recursively
+# and only ignore the root build_artifacts folder.
+!/build_artifacts/**
+/build_artifacts
+
 *.pyc
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index cbe11d90..32b651eb 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -65,12 +65,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then
   cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt"
 fi
 
-if [[ "${sha:-}" == "" ]]; then
-  pushd ${FEEDSTOCK_ROOT}
-  sha=$(git rev-parse HEAD)
-  popd
-fi
-
 if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then
         EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}"
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
index b70ef014..00f377a8 100755
--- a/.scripts/run_docker_build.sh
+++ b/.scripts/run_docker_build.sh
@@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then
     export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT})
 fi
 
+if [[ "${sha:-}" == "" ]]; then
+  pushd "${FEEDSTOCK_ROOT}"
+  sha=$(git rev-parse HEAD)
+  popd
+fi
+
 docker info
 
 # In order for the conda-build process in the container to write to the mounted
diff --git a/recipe/build.sh b/recipe/build.sh
index 0f7cae4b..edbbc3f6 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -29,12 +29,6 @@ fi
 mkdir build
 cd build
 
-# Workaround for https://github.com/conda-forge/gazebo-feedstock/pull/150
-# Remove when boost is updated to 1.80.0
-if [[ "${target_platform}" == "osx-64" ]]; then
-  export CXXFLAGS="-DBOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC ${CXXFLAGS}"
-fi
-
 if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then
   export CMAKE_ARGS="${CMAKE_ARGS} -DFREEIMAGE_RUNS:BOOL=ON -DFREEIMAGE_RUNS__TRYRUN_OUTPUT:STRING="" -DFREEIMAGE_COMPILES:BOOL=ON -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DPROTOBUF_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DGAZEBOMSGS_OUT_EXECUTABLE:STRING=`pwd`/../build-host/gazebo/msgs/gazebomsgs_out"
 fi
diff --git a/recipe/fix_build.patch b/recipe/fix_build.patch
deleted file mode 100644
index 1658fa37..00000000
--- a/recipe/fix_build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
-index 2b79fd4be3..d55e8ce8e3 100644
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -541,14 +542,15 @@ if (PKG_CONFIG_FOUND)
- 
-   ########################################
-   # Find GNU Triangulation Surface Library
--  pkg_check_modules(gts gts)
--  if (gts_FOUND)
--    message (STATUS "Looking for GTS - found")
--    set (HAVE_GTS TRUE)
--  else ()
--    set (HAVE_GTS FALSE)
--    BUILD_WARNING ("GNU Triangulation Surface library not found - Gazebo will not have CSG support.")
--  endif ()
-+  # pkg_check_modules(gts gts)
-+  # if (gts_FOUND)
-+  #   message (STATUS "Looking for GTS - found")
-+  #   set (HAVE_GTS TRUE)
-+  # else ()
-+  #   set (HAVE_GTS FALSE)
-+  #   BUILD_WARNING ("GNU Triangulation Surface library not found - Gazebo will not have CSG support.")
-+  # endif ()
-+  set (HAVE_GTS FALSE)
- 
-   #################################################
-   # Find bullet
-@@ -669,15 +671,16 @@ add_manpage_target()
- 
- ########################################
- # Find Space Navigator header and library
--find_library(SPNAV_LIBRARY NAMES spnav)
--find_file(SPNAV_HEADER NAMES spnav.h)
--if (SPNAV_LIBRARY AND SPNAV_HEADER)
--  message(STATUS "Looking for libspnav and spnav.h - found")
--  set(HAVE_SPNAV TRUE)
--else()
--  message(STATUS "Looking for libspnav and spnav.h - not found")
--  set(HAVE_SPNAV FALSE)
--endif()
-+# find_library(SPNAV_LIBRARY NAMES spnav)
-+# find_file(SPNAV_HEADER NAMES spnav.h)
-+# if (SPNAV_LIBRARY AND SPNAV_HEADER)
-+#   message(STATUS "Looking for libspnav and spnav.h - found")
-+#   set(HAVE_SPNAV TRUE)
-+# else()
-+#   message(STATUS "Looking for libspnav and spnav.h - not found")
-+#   set(HAVE_SPNAV FALSE)
-+# endif()
-+set(HAVE_SPNAV FALSE)
- 
- ########################################
- # Find xsltproc, which is used by tools/check_test_ran.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index a0a50d48..e0b34dd3 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -13,7 +13,7 @@ source:
       - fix-invisible-meshes.patch
 
 build:
-  number: 6
+  number: 7
   run_exports:
     - {{ pin_subpackage('gazebo', max_pin='x') }}