diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index ec50860..eef8dce 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -31,16 +31,14 @@ jobs:
       ROS_DISTRO: ${{ matrix.ros_distro }}
       ROS_VERSION: 1
     steps:
-    # TODO(setup-ros-docker#7): calling chown is necessary for now
-    - name: Run setup-ros-docker workaround
-      run: sudo chown -R rosbuild:rosbuild "$HOME" .
     # Needed to access the vcs repos file from the workspace
     - name: Checkout source
       uses: actions/checkout@v2
     - name: Run action-ros-ci to build and test
-      uses: ros-tooling/action-ros-ci@0.0.17
+      uses: ros-tooling/action-ros-ci@0.1.0
       with:
-        source-ros-binary-installation: ${{ matrix.ros_distro }}
+        target-ros1-distro: ${{ env.ROS_VERSION == '1' && matrix.ros_distro || '' }}
+        target-ros2-distro: ${{ env.ROS_VERSION == '2' && matrix.ros_distro || '' }}
         package-name: aws_ros1_common
         extra-cmake-args: ${{ matrix.extra_cmake_args }}
         vcs-repo-file-url: ''
diff --git a/.github/workflows/build_and_test_release_latest.yml b/.github/workflows/build_and_test_release_latest.yml
index ed6ff45..a32d054 100644
--- a/.github/workflows/build_and_test_release_latest.yml
+++ b/.github/workflows/build_and_test_release_latest.yml
@@ -27,16 +27,14 @@ jobs:
       ROS_DISTRO: ${{ matrix.ros_distro }}
       ROS_VERSION: 1
     steps:
-    # TODO(setup-ros-docker#7): calling chown is necessary for now
-    - name: Run setup-ros-docker workaround
-      run: sudo chown -R rosbuild:rosbuild "$HOME" .
     # Needed to access the vcs repos file from the workspace
     - name: Checkout source
       uses: actions/checkout@v2
     - name: Run action-ros-ci to build and test
-      uses: ros-tooling/action-ros-ci@0.0.17
+      uses: ros-tooling/action-ros-ci@0.1.0
       with:
-        source-ros-binary-installation: ${{ matrix.ros_distro }}
+        target-ros1-distro: ${{ env.ROS_VERSION == '1' && matrix.ros_distro || '' }}
+        target-ros2-distro: ${{ env.ROS_VERSION == '2' && matrix.ros_distro || '' }}
         package-name: aws_ros1_common
         extra-cmake-args: ${{ matrix.extra_cmake_args }}
         # schedule runs against the default branch (master), so specify release-latest via repos file