diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8d45f1e5f..c61e5d2ae 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -10,8 +10,6 @@ jobs:
     container:
       image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-testing-latest
     steps:
-    # TODO(setup-ros-docker#7): calling chown is necessary for now
-    - run: sudo chown -R rosbuild:rosbuild "$HOME" .
     - uses: actions/checkout@v2
     - uses: ros-tooling/action-ros-lint@0.0.6
       with:
@@ -33,8 +31,6 @@ jobs:
     container:
       image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-testing-latest
     steps:
-    # TODO(setup-ros-docker#7): calling chown is necessary for now
-    - run: sudo chown -R rosbuild:rosbuild "$HOME" .
     - uses: actions/checkout@v2
     - uses: ros-tooling/action-ros-lint@0.0.6
       with:
@@ -62,8 +58,6 @@ jobs:
     container:
       image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-testing-latest
     steps:
-    # TODO(setup-ros-docker#7): calling chown is necessary for now
-    - run: sudo chown -R rosbuild:rosbuild "$HOME" .
     - uses: actions/checkout@v2
     - uses: ros-tooling/action-ros-lint@0.0.6
       with:
@@ -88,8 +82,6 @@ jobs:
       matrix:
           linter: [pep257, flake8]
     steps:
-    # TODO(setup-ros-docker#7): calling chown is necessary for now
-    - run: sudo chown -R rosbuild:rosbuild "$HOME" .
     - uses: actions/checkout@v2
     - uses: ros-tooling/action-ros-lint@0.0.6
       with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9e5feb427..e34860a50 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,9 +15,7 @@ jobs:
     container:
       image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-testing-latest
     steps:
-    # TODO(setup-ros-docker#7): calling chown is necessary for now
-    - run: sudo chown -R rosbuild:rosbuild "$HOME" .
-    - uses: ros-tooling/action-ros-ci@0.0.16
+    - uses: ros-tooling/action-ros-ci@0.1.0
       with:
         package-name: |
           ros2bag