diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index e857ef3..1363862 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -6,20 +6,20 @@ on:
       - ros2
 
 jobs:
-  build_and_test_source_rolling:
+  build_and_test_source_kilted:
     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-noble-testing
     steps:
     - name: Build and run tests
       id: action-ros-ci
-      uses: ros-tooling/action-ros-ci@v0.3
+      uses: ros-tooling/action-ros-ci@v0.4
       with:
         package-name: |
           turtle_tf2_py
           turtle_tf2_cpp
-        target-ros2-distro: rolling
-        vcs-repo-file-url: https://raw.githubusercontent.com/ros2/ros2/rolling/ros2.repos
+        target-ros2-distro: kilted
+        vcs-repo-file-url: https://raw.githubusercontent.com/ros2/ros2/kilted/ros2.repos
         colcon-defaults: |
           {
             "build": {
@@ -32,19 +32,19 @@ jobs:
               "pytest-args": ["-m", "not xfail"]
             }
           }
-  build_and_test_binaries_rolling:
+  build_and_test_binaries_kilted:
     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-noble-testing
     steps:
     - name: Build and run tests
       id: action-ros-ci
-      uses: ros-tooling/action-ros-ci@v0.3
+      uses: ros-tooling/action-ros-ci@v0.4
       with:
         package-name: |
           turtle_tf2_py
           turtle_tf2_cpp
-        target-ros2-distro: rolling
+        target-ros2-distro: kilted
         colcon-defaults: |
           {
             "build": {
diff --git a/turtle_tf2_py/turtle_tf2_py/turtle_tf2_listener.py b/turtle_tf2_py/turtle_tf2_py/turtle_tf2_listener.py
index bb835bc..c8904b7 100644
--- a/turtle_tf2_py/turtle_tf2_py/turtle_tf2_listener.py
+++ b/turtle_tf2_py/turtle_tf2_py/turtle_tf2_listener.py
@@ -24,7 +24,7 @@
 from tf2_ros.buffer import Buffer
 from tf2_ros.transform_listener import TransformListener
 
-from turtlesim.srv import Spawn
+from turtlesim_msgs.srv import Spawn
 
 
 class FrameListener(Node):