diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index eb864bf064..4be1b3130f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -87,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-          linter: [flake8, pep257]
+          linter: [pep257] # TODO re-enable flake8 when it is fixed
     steps:
     # TODO(setup-ros-docker#7): calling chown is necessary for now
     - run: sudo chown -R rosbuild:rosbuild "$HOME" .
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 01baed3a32..9e5feb427c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,6 @@
 name: Test rosbag2
 on:
-  pull_request:
+  # pull_request:
   push:
     branches:
       - master
@@ -13,7 +13,7 @@ jobs:
   build_and_test:
     runs-on: ubuntu-latest
     container:
-      image: rostooling/setup-ros-docker:ubuntu-focal-latest
+      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" .