diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9356e28c9e..7c7691e784 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
       image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-testing-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: ros-tooling/action-ros-lint@0.0.6
+    - uses: ros-tooling/action-ros-lint@v0.1
       with:
         linter: copyright
         distribution: foxy
@@ -32,7 +32,7 @@ jobs:
       image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-testing-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: ros-tooling/action-ros-lint@0.0.6
+    - uses: ros-tooling/action-ros-lint@v0.1
       with:
         linter: xmllint
         distribution: foxy
@@ -59,7 +59,7 @@ jobs:
       image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-testing-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: ros-tooling/action-ros-lint@0.0.6
+    - uses: ros-tooling/action-ros-lint@v0.1
       with:
         linter: ${{ matrix.linter }}
         distribution: foxy
@@ -83,7 +83,7 @@ jobs:
           linter: [pep257, flake8]
     steps:
     - uses: actions/checkout@v2
-    - uses: ros-tooling/action-ros-lint@0.0.6
+    - uses: ros-tooling/action-ros-lint@v0.1
       with:
         linter: ${{ matrix.linter }}
         distribution: foxy
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 563816333d..c38afb621d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,19 +3,21 @@ on:
   pull_request:
   push:
     branches:
-      - master
-  schedule:
-    # Run every hour. This helps detect flakiness,
-    # and broken external dependencies.
-    - cron:  '0 * * * *'
+      - foxy-future
+  # NOTE: build schedules are only supported for the default branch - this wouldn't work anyways
+  # schedule:
+  #   # Run every hour. This helps detect flakiness,
+  #   # and broken external dependencies.
+  #   - cron:  '0 * * * *'
 
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
     container:
-      image: rostooling/setup-ros-docker:ubuntu-focal-latest
+      # Use the ros-base container, so that the rosbag2 binaries are already installed
+      image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-latest
     steps:
-    - uses: ros-tooling/action-ros-ci@v0.1
+    - uses: ros-tooling/action-ros-ci@v0.2
       with:
         package-name: |
           ros2bag
@@ -31,7 +33,6 @@ jobs:
           sqlite3_vendor
           zstd_vendor
         target-ros2-distro: foxy
-        vcs-repo-file-url: ""
     - uses: actions/upload-artifact@v1
       with:
         name: colcon-logs