diff --git a/.github/workflows/r2r_galactic.yml b/.github/workflows/r2r_galactic.yml
index 99180aa..5c5f3d1 100644
--- a/.github/workflows/r2r_galactic.yml
+++ b/.github/workflows/r2r_galactic.yml
@@ -2,7 +2,11 @@ name: r2r_galactic
 
 on:
   push:
+    branches-ignore:
+      - rclrs
   pull_request:
+    branches-ignore:
+      - rclrs
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/r2r_humble.yml b/.github/workflows/r2r_humble.yml
index 2f8721d..5373957 100644
--- a/.github/workflows/r2r_humble.yml
+++ b/.github/workflows/r2r_humble.yml
@@ -2,7 +2,11 @@ name: r2r_humble
 
 on:
   push:
+    branches-ignore:
+      - rclrs
   pull_request:
+    branches-ignore:
+      - rclrs
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/r2r_iron.yml b/.github/workflows/r2r_iron.yml
index a773884..5de642d 100644
--- a/.github/workflows/r2r_iron.yml
+++ b/.github/workflows/r2r_iron.yml
@@ -2,7 +2,11 @@ name: r2r_iron
 
 on:
   push:
+    branches-ignore:
+      - rclrs
   pull_request:
+    branches-ignore:
+      - rclrs
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/rclrs_humble.yml b/.github/workflows/rclrs_humble.yml
index 34c0ae4..ca65ecb 100644
--- a/.github/workflows/rclrs_humble.yml
+++ b/.github/workflows/rclrs_humble.yml
@@ -2,7 +2,11 @@ name: rclrs_humble
 
 on:
   push:
+    branches:
+      - rclrs
   pull_request:
+    branches:
+      - rclrs
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/rosrust_noetic.yml b/.github/workflows/rosrust_noetic.yml
index a5acf78..4662df4 100644
--- a/.github/workflows/rosrust_noetic.yml
+++ b/.github/workflows/rosrust_noetic.yml
@@ -2,7 +2,11 @@ name: rosrust_noetic
 
 on:
   push:
+    branches-ignore:
+      - rclrs
   pull_request:
+    branches-ignore:
+      - rclrs
   workflow_dispatch:
 
 jobs:
diff --git a/tests/Dockerfile_rclrs_humble b/tests/Dockerfile_rclrs_humble
index 9bf10c7..d5ee37b 100644
--- a/tests/Dockerfile_rclrs_humble
+++ b/tests/Dockerfile_rclrs_humble
@@ -13,22 +13,22 @@ RUN apt-get install -y \
     python3-pip \
     python3-vcstool
 
-# Get ros test messages
-RUN apt-get install -y ros-humble-test-msgs ros-humble-example-interfaces
-
 # Get Rust
 RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | bash -s -- -y
 RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
-RUN cargo install --debug cargo-ament-build
+RUN . $HOME/.cargo/env && cargo install --debug cargo-ament-build
 RUN pip install git+https://github.com/colcon/colcon-cargo.git
 RUN pip install git+https://github.com/colcon/colcon-ros-cargo.git
 
 WORKDIR /ros2_rust_build
 RUN git clone https://github.com/ros2-rust/ros2_rust.git src/ros2_rust
 RUN vcs import src < src/ros2_rust/ros2_rust_humble.repos
-RUN . /opt/ros/humble/setup.sh && colcon build
 
-WORKDIR /rclrs
+WORKDIR /ros2_rust_build/src/ros_pointcloud2_tests
 COPY . .
-RUN chmod +x /rclrs/tests/rclrs_test.bash
-ENTRYPOINT [ "/rclrs/tests/rclrs_test.bash" ]
+
+WORKDIR /ros2_rust_build
+RUN . $HOME/.cargo/env && . /opt/ros/humble/setup.sh && colcon build
+
+RUN chmod +x /ros2_rust_build/src/ros_pointcloud2_tests/tests/rclrs_test.bash
+ENTRYPOINT [ "/ros2_rust_build/src/ros_pointcloud2_tests/tests/rclrs_test.bash" ]
diff --git a/tests/rclrs_test.bash b/tests/rclrs_test.bash
index 709befc..4afaab4 100644
--- a/tests/rclrs_test.bash
+++ b/tests/rclrs_test.bash
@@ -6,20 +6,20 @@
 rustup update
 
 if [ -e "/opt/ros/iron/setup.bash" ]; then
-    source "/opt/ros/iron/setup.bash"
-    source "/ros2_rust_build/install/local_setup.bash"
+    . "/opt/ros/iron/setup.bash"
+    . "/ros2_rust_build/install/local_setup.bash"
 fi
 
 if [ -e "/opt/ros/humble/setup.bash" ]; then
-    source "/opt/ros/humble/setup.bash"
-    source "/ros2_rust_build/install/local_setup.bash"
+    . "/opt/ros/humble/setup.bash"
+    . "/ros2_rust_build/install/local_setup.bash"
 fi
 
 if [ -e "/opt/ros/galactic/setup.bash" ]; then
-    source "/opt/ros/galactic/setup.bash"
-    source "/ros2_rust_build/install/local_setup.bash"
+    . "/opt/ros/galactic/setup.bash"
+    . "/ros2_rust_build/install/local_setup.bash"
 fi
 
-cd /rclrs/ || exit
+cd /ros2_rust_build/src/ros_pointcloud2_tests/ || exit
 
 "$@"