diff --git a/repositories/fastcdr.BUILD.bazel b/repositories/fastcdr.BUILD.bazel
index 8cd8ab3c..7885706b 100644
--- a/repositories/fastcdr.BUILD.bazel
+++ b/repositories/fastcdr.BUILD.bazel
@@ -9,7 +9,6 @@ filegroup(
 )
 
 cache_entries = {
-    "CMAKE_BUILD_TYPE": "Release",
     "CMAKE_POSITION_INDEPENDENT_CODE": "ON",  # Must be set!
     "BUILD_SHARED_LIBS": "OFF",
     # FastCDR specific options.
diff --git a/repositories/fastrtps.BUILD.bazel b/repositories/fastrtps.BUILD.bazel
index a37e3121..cc512324 100644
--- a/repositories/fastrtps.BUILD.bazel
+++ b/repositories/fastrtps.BUILD.bazel
@@ -69,7 +69,6 @@ filegroup(
 )
 
 cache_entries = {
-    "CMAKE_BUILD_TYPE": "Release",
     "CMAKE_POSITION_INDEPENDENT_CODE": "ON",  # Must be set!
     "BUILD_SHARED_LIBS": "OFF",
     # FastDDS specific options.
diff --git a/repositories/foonathan_memory.BUILD.bazel b/repositories/foonathan_memory.BUILD.bazel
index 6d536b54..5a56a3ef 100644
--- a/repositories/foonathan_memory.BUILD.bazel
+++ b/repositories/foonathan_memory.BUILD.bazel
@@ -9,7 +9,6 @@ filegroup(
 )
 
 cache_entries = {
-    "CMAKE_BUILD_TYPE": "Release",
     "CMAKE_POSITION_INDEPENDENT_CODE": "ON",  # Must be set!
     "BUILD_SHARED_LIBS": "OFF",
     # foonathan_memory specific options.
diff --git a/repositories/ros2_repositories_impl.bzl b/repositories/ros2_repositories_impl.bzl
index 741a8a0d..7f7e300c 100644
--- a/repositories/ros2_repositories_impl.bzl
+++ b/repositories/ros2_repositories_impl.bzl
@@ -286,8 +286,8 @@ def ros2_repositories_impl():
         http_archive,
         name = "ros2_rmw_fastrtps",
         build_file = "@com_github_mvukov_rules_ros2//repositories:rmw_fastrtps.BUILD.bazel",
-        patch_args = ["-p1"],
-        patches = ["@com_github_mvukov_rules_ros2//repositories/patches:rmw_fastrtps-fix-typesupport-conditions-bug.patch"],
+        #patch_args = ["-p1"],
+        #patches = ["@com_github_mvukov_rules_ros2//repositories/patches:rmw_fastrtps-fix-typesupport-conditions-bug.patch"],
         sha256 = "a0145b414207a2528fd56e98a56bd6d4c3f0353dcd58f4b3a65224af8bd52284",
         strip_prefix = "rmw_fastrtps-6.2.3",
         url = "https://github.com/ros2/rmw_fastrtps/archive/refs/tags/6.2.3.tar.gz",
diff --git a/ros2/test/BUILD.bazel b/ros2/test/BUILD.bazel
index 42ed53ca..25260f2e 100644
--- a/ros2/test/BUILD.bazel
+++ b/ros2/test/BUILD.bazel
@@ -60,6 +60,7 @@ ros2_cpp_test(
     idl_deps = [
         "@ros2_common_interfaces//:std_msgs",
     ],
+    linkstatic = False,
     deps = [
         "@com_google_googletest//:gtest",
         "@ros2_rclcpp//:rclcpp",