diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6c8bd39..3bac495 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,6 +10,7 @@ on:
   pull_request:
     branches:
       - 'master'
+      - 'releases/v*'
     paths-ignore:
       - '**.md'
 
@@ -20,12 +21,18 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v2
+      -
+        name: Validate
+        uses: docker/bake-action@v1
+        with:
+          targets: validate
       -
         name: Test
-        run: docker buildx bake test
+        uses: docker/bake-action@v1
+        with:
+          targets: test
       -
         name: Upload coverage
         uses: codecov/codecov-action@v1
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage/clover.xml
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
deleted file mode 100644
index 0134e68..0000000
--- a/.github/workflows/validate.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: validate
-
-on:
-  push:
-    branches:
-      - 'master'
-      - 'releases/v*'
-    paths-ignore:
-      - '**.md'
-  pull_request:
-    branches:
-      - 'master'
-    paths-ignore:
-      - '**.md'
-
-jobs:
-  validate:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Validate
-        run: docker buildx bake validate