diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index a2dcb1eb..0d66ccb1 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -4,16 +4,14 @@ on:
     branches:
       - multiarch
       - multiarch-latest
-      - java*
+      - java15
+      - java16
       - test/multiarch/*
-    branches-ignore:
-      - java8
     tags:
       - "[0-9]+.[0-9]+.[0-9]+-multiarch"
       - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
-      - "[0-9]+.[0-9]+.[0-9]+-java*"
-    tags-ignore:
-      - "[0-9]+.[0-9]+.[0-9]+-java8"
+      - "[0-9]+.[0-9]+.[0-9]+-java15"
+      - "[0-9]+.[0-9]+.[0-9]+-java16"
     paths-ignore:
       - "*.md"
       - "docs/**"