diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index c527fa9..e1e0205 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,7 +10,7 @@ jobs:
     name: ament_${{ matrix.linter }}
     runs-on: ubuntu-latest
     container:
-      image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest
+      image: ghcr.io/ros-tooling/setup-ros-docker/setup-ros-docker-ubuntu-resolute-ros-rolling-ros-base:master
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e83bbdf..89aa27d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,7 @@ jobs:
   build_and_test:
     runs-on: ubuntu-latest
     container:
-      image: rostooling/setup-ros-docker:ubuntu-noble-latest
+      image: ghcr.io/ros-tooling/setup-ros-docker/setup-ros-docker-ubuntu-resolute:latest
     steps:
     - uses: ros-tooling/action-ros-ci@v0.4
       with:
diff --git a/topic_tools/test/test_topic_tool.hpp b/topic_tools/test/test_topic_tool.hpp
index 54f9790..1266bdc 100644
--- a/topic_tools/test/test_topic_tool.hpp
+++ b/topic_tools/test/test_topic_tool.hpp
@@ -67,7 +67,6 @@ class TestTopicToolSingleSub : public TestTopicTool
 public:
   void SetUp()
   {
-    using std::placeholders::_1;
     const std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
     test_node_ = rclcpp::Node::make_shared(test_name);
@@ -124,7 +123,6 @@ class TestTopicToolMultiSub : public TestTopicTool
 public:
   void SetUp()
   {
-    using std::placeholders::_1;
     const std::string test_name =
       ::testing::UnitTest::GetInstance()->current_test_info()->name();
     test_node_ = rclcpp::Node::make_shared(test_name);
@@ -196,7 +194,6 @@ class TestTopicToolMultiPub : public TestTopicTool
 public:
   void SetUp()
   {
-    using std::placeholders::_1;
     const std::string test_name = ::testing::UnitTest::GetInstance()->current_test_info()->name();
     test_node_ = rclcpp::Node::make_shared(test_name);
     executor_ = std::make_shared<rclcpp::executors::SingleThreadedExecutor>();