diff --git a/.github/workflows/release-debian.yml b/.github/workflows/release-debian.yml
index be55e00..b9344f4 100644
--- a/.github/workflows/release-debian.yml
+++ b/.github/workflows/release-debian.yml
@@ -23,6 +23,9 @@ jobs:
           - distro: "debian"
             release: "bullseye"
             arch: "amd64"
+          - distro: "debian"
+            release: "bookworm"
+            arch: "amd64"
           - distro: "ubuntu"
             release: "bionic"
             arch: "amd64"
@@ -30,10 +33,10 @@ jobs:
             release: "focal"
             arch: "amd64"
           - distro: "ubuntu"
-            release: "impish"
+            release: "jammy"
             arch: "amd64"
           - distro: "ubuntu"
-            release: "jammy"
+            release: "lunar"
             arch: "amd64"
     container:
       image: ${{ matrix.distro }}:${{ matrix.release }}
@@ -90,6 +93,14 @@ jobs:
             release: "bullseye"
             image: "bullseye"
             arch: "aarch64"
+          - distro: "debian"
+            release: "bookworm"
+            image: "bookworm"
+            arch: "armv7"
+          - distro: "debian"
+            release: "bookworm"
+            image: "bookworm"
+            arch: "aarch64"
           - distro: "ubuntu"
             release: "bionic"
             image: "ubuntu18.04"
@@ -130,6 +141,14 @@ jobs:
             release: "bullseye"
             image: "bullseye"
             arch: "aarch64"
+          - distro: "raspbian"
+            release: "bookworm"
+            image: "bookworm"
+            arch: "armv7"
+          - distro: "raspbian"
+            release: "bookworm"
+            image: "bookworm"
+            arch: "aarch64"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
diff --git a/.github/workflows/test-debian.yml b/.github/workflows/test-debian.yml
index 91ad40a..5433814 100644
--- a/.github/workflows/test-debian.yml
+++ b/.github/workflows/test-debian.yml
@@ -18,6 +18,9 @@ jobs:
           - distro: "debian"
             release: "bullseye"
             arch: "amd64"
+          - distro: "debian"
+            release: "bookworm"
+            arch: "amd64"
           - distro: "ubuntu"
             release: "bionic"
             arch: "amd64"
@@ -25,10 +28,10 @@ jobs:
             release: "focal"
             arch: "amd64"
           - distro: "ubuntu"
-            release: "impish"
+            release: "jammy"
             arch: "amd64"
           - distro: "ubuntu"
-            release: "jammy"
+            release: "lunar"
             arch: "amd64"
     container:
       image: ${{ matrix.distro }}:${{ matrix.release }}
@@ -72,6 +75,14 @@ jobs:
             release: "bullseye"
             image: "bullseye"
             arch: "aarch64"
+          - distro: "debian"
+            release: "bookworm"
+            image: "bookworm"
+            arch: "armv7"
+          - distro: "debian"
+            release: "bookworm"
+            image: "bookworm"
+            arch: "aarch64"
           - distro: "ubuntu"
             release: "bionic"
             image: "ubuntu18.04"
@@ -112,6 +123,14 @@ jobs:
             release: "bullseye"
             image: "bullseye"
             arch: "aarch64"
+          - distro: "raspbian"
+            release: "bookworm"
+            image: "bookworm"
+            arch: "armv7"
+          - distro: "raspbian"
+            release: "bookworm"
+            image: "bookworm"
+            arch: "aarch64"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2