diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 724c42ff..d00a4bea 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,31 +1,18 @@
-name: rospkg-ci
+---
+name: Run tests
 
-on:
+on:  # yamllint disable-line rule:truthy
   push:
-    branches: [master]
+    branches: ['master']
   pull_request:
 
 jobs:
-    build:
-      strategy:
-        matrix:
-          os: [ubuntu-latest, macos-latest]
-          python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
-          include:
-          - os: ubuntu-20.04
-            python: '3.6'
-      name: rospkg tests
-      runs-on: ${{matrix.os}}
-
-      steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{matrix.python}}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{matrix.python}}
-      - name: Install dependencies
-        run: |
-          python -m pip install -U -e .[test] pytest-cov -c constraints.txt
-      - name: Run tests
-        run: |
-          python -m pytest --cov test
+  pytest:
+    uses: ros-infrastructure/ci/.github/workflows/pytest.yaml@main
+    with:
+      matrix-filter: del(.matrix.os[] | select(contains("windows")))
+  yamllint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: yamllint -f github .
diff --git a/rosdoc.yaml b/rosdoc.yaml
index d21d73ab..fea7ba97 100644
--- a/rosdoc.yaml
+++ b/rosdoc.yaml
@@ -1,2 +1,3 @@
- - builder: sphinx
-   sphinx_root_dir: doc
+---
+- builder: sphinx
+  sphinx_root_dir: doc
diff --git a/test/stack_tests/s2/baz/stack.yaml b/test/stack_tests/s2/baz/stack.yaml
index 1f18bd91..ee4038e1 100644
--- a/test/stack_tests/s2/baz/stack.yaml
+++ b/test/stack_tests/s2/baz/stack.yaml
@@ -1,8 +1,9 @@
+---
 Catkin-ProjectName: baz
 Version: 1.7.3-yaml
 Depends: catkin, rospack
 Description: baz
-Author: No One 
+Author: No One
 Maintainer: No One <kwc@willowgarage.com>
 Homepage: http://www.ros.org