diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69124407..fc5d372b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,32 +13,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        name: [fedora-gcc, fedora-clang, debian-clang, fedora-distcheck]
+        name: [fedora, debian]
+        compiler: [gcc, clang]
         token: [softokn, softhsm]
         include:
-          - name: fedora-gcc
+          - name: fedora
             container: fedora:latest
-            compiler: gcc
-            action: check
-          - name: fedora-clang
-            container: fedora:latest
-            compiler: clang
-            action: check
-          - name: debian-clang
+          - name: debian
             container: debian:sid
-            compiler: clang
-            action: check
-          - name: fedora-distcheck
-            container: fedora:latest
-            compiler: gcc
-            action: distcheck
     container: ${{ matrix.container }}
     steps:
     - name: Install Dependencies
       run: |
           if [ -f /etc/fedora-release ]; then
             dnf -y install git ${{ matrix.compiler }} automake libtool \
-              pkgconf-pkg-config autoconf-archive openssl-devel openssl xz
+              pkgconf-pkg-config autoconf-archive openssl-devel openssl
             if [ "${{ matrix.token }}" = "softokn" ]; then
               dnf -y install nss-softokn nss-tools nss-softokn-devel
             elif [ "${{ matrix.token }}" = "softhsm" ]; then
@@ -62,7 +51,7 @@ jobs:
         autoreconf -fiv
         CC=${{ matrix.compiler }} ./configure
     - name: Build and Test
-      run: make ${{ matrix.action }}
+      run: make check
     - uses: actions/upload-artifact@v3
       if: failure()
       with:
diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
new file mode 100644
index 00000000..7155f54e
--- /dev/null
+++ b/.github/workflows/distcheck.yml
@@ -0,0 +1,41 @@
+name: Distcheck
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  distcheck:
+    name: Test make distcheck
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [fedora, debian]
+        include:
+          - name: fedora
+            container: fedora:latest
+          - name: debian
+            container: debian:sid
+    container: ${{ matrix.container }}
+    steps:
+    - name: Install Dependencies
+      run: |
+          if [ -f /etc/fedora-release ]; then
+            dnf -y install git gcc automake libtool \
+              pkgconf-pkg-config autoconf-archive openssl-devel openssl xz \
+              nss-softokn nss-tools nss-softokn-devel
+          elif [ -f /etc/debian_version ]; then
+            apt-get -q update
+            apt-get -yq install git gcc make automake \
+              libtool pkg-config autoconf-archive libssl-dev openssl xz-utils \
+              libnss3 libnss3-tools libnss3-dev
+          fi
+    - name: Checkout Repository
+      uses: actions/checkout@v3
+    - name: Setup
+      run: |
+        autoreconf -fiv
+        ./configure
+    - name: Distcheck
+      run: make distcheck