diff --git a/.github/workflows/maven-and-native.yml b/.github/workflows/maven-and-native.yml
index aeb3d3d72..a27789498 100644
--- a/.github/workflows/maven-and-native.yml
+++ b/.github/workflows/maven-and-native.yml
@@ -165,20 +165,19 @@ jobs:
       fail-fast: false
       matrix:
         dist:
-          - { vendor: ubuntu, dist: bionic }
           - { vendor: ubuntu, dist: focal }
           - { vendor: ubuntu, dist: jammy }
-          - { vendor: debian, dist: buster }
+          - { vendor: ubuntu, dist: lunar }
           - { vendor: debian, dist: bullseye }
+          - { vendor: debian, dist: bookworm }
         arch:
           - amd64
           - arm64
           - ppc64el
         include: [
-          # crossbuild-essential-i386 is missing on bionic, failing sbuild
-          #{ dist: { vendor: ubuntu, dist: bionic }, arch: i386 },
           { dist: { vendor: debian, dist: buster }, arch: i386 },
           { dist: { vendor: debian, dist: bullseye }, arch: i386 },
+          { dist: { vendor: debian, dist: bookworm }, arch: i386 },
         ]
 
     env: