diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6882dea5c..34c072de4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -140,7 +140,7 @@ jobs:
       DEBEMAIL: github-actions@github.com
     steps:
     - name: Install dependencies
-      run: apt update -qq && apt install --no-install-recommends -y lsb-release build-essential devscripts debhelper lintian pkg-config ${UBUNTU_DEPS} doxygen swig openjdk-17-jdk-headless libpython3-dev python3-setuptools libboost-test-dev
+      run: apt update -qq && apt install --no-install-recommends -y lsb-release build-essential devscripts debhelper lintian pkg-config ${UBUNTU_DEPS} doxygen swig default-jdk-headless libpython3-dev python3-setuptools libboost-test-dev
     - name: Checkout
       uses: actions/checkout@v4
     - name: Setup changelog
@@ -150,7 +150,7 @@ jobs:
         dch --distribution $(lsb_release -cs) -v ${VERSIONEX} "Release ${VERSIONEX}."
     - name: Build packages
       run: |
-        JAVA_HOME=/usr/lib/jvm/java-17-openjdk-${{ matrix.arch }} dpkg-buildpackage -us -uc
+        JAVA_HOME=/usr/lib/jvm/default-java dpkg-buildpackage -us -uc
         mv ../libdigidocpp*.* .
     - name: Lintian
       run: lintian *.deb;
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
new file mode 100644
index 000000000..2e81309c6
--- /dev/null
+++ b/.github/workflows/debian.yml
@@ -0,0 +1,66 @@
+name: Debian
+on:
+  schedule:
+    - cron: "0 4 * * *"
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+permissions:
+  contents: read
+env:
+  BUILD_NUMBER: ${{github.run_number}}
+  CMAKE_BUILD_PARALLEL_LEVEL: 4
+jobs:
+  debian:
+    name: ${{matrix.rel}} ${{matrix.arch}}
+    runs-on: ubuntu-24.04${{matrix.arch == 'arm64' && '-arm' || ''}}
+    container: debian:${{matrix.rel}}
+    strategy:
+      matrix:
+        rel: [sid, forky, trixie, bookworm]
+        arch: [amd64, arm64]
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      DEBFULLNAME: github-actions
+      DEBEMAIL: github-actions@github.com
+    steps:
+      - name: Dependencies
+        run: |
+          apt-get -qq update
+          apt-get -y install --no-install-recommends \
+            build-essential \
+            cmake \
+            debhelper \
+            default-jdk-headless \
+            devscripts \
+            doxygen \
+            libboost-test-dev \
+            libpython3-dev \
+            libxml2-dev \
+            libxmlsec1-dev \
+            lintian \
+            lsb-release \
+            pkg-config \
+            python3-setuptools \
+            swig \
+            zlib1g-dev \
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup
+        run: |
+          export VERSION=$(grep project CMakeLists.txt | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")
+          export VERSIONEX=${VERSION}+${{matrix.rel}}.${BUILD_NUMBER}
+          dch --distribution ${{matrix.rel}} -v ${VERSIONEX} "Release ${VERSIONEX}."
+      - name: Build
+        run: |
+          JAVA_HOME=/usr/lib/jvm/default-java dpkg-buildpackage -us -uc
+          mv ../libdigidocpp*.* .
+      - name: Check
+        run: |
+          lintian *.deb
+      - name: Publish
+        uses: actions/upload-artifact@v4
+        with:
+          name: debian_${{matrix.rel}}_${{matrix.arch}}
+          path: libdigidocpp*.*
diff --git a/debian/control b/debian/control
index 60cd77f13..e9663d42f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  libxmlsec1-dev,
  doxygen,
  swig,
- java17-sdk-headless,
+ default-jdk-headless,
  libpython3-dev,
  python3-setuptools
 Standards-Version: 4.6.1