diff --git a/.github/images/alpine.Dockerfile b/.github/images/alpine.Dockerfile
new file mode 100644
index 0000000..154c06b
--- /dev/null
+++ b/.github/images/alpine.Dockerfile
@@ -0,0 +1,17 @@
+ARG image=alpine:latest
+FROM $image
+
+# Install dependencies
+RUN apk upgrade
+RUN apk add autoconf automake file gcc gzip libtool make musl-dev
+
+# Add source code
+ADD . /src
+WORKDIR /src
+
+# Run steps
+RUN ./bootstrap
+RUN ./configure
+RUN make
+RUN make check
+RUN make distcheck
diff --git a/.github/images/alpine:3.14.Dockerfile b/.github/images/alpine:3.14.Dockerfile
new file mode 120000
index 0000000..53292c5
--- /dev/null
+++ b/.github/images/alpine:3.14.Dockerfile
@@ -0,0 +1 @@
+alpine.Dockerfile
\ No newline at end of file
diff --git a/.github/images/alpine:edge.Dockerfile b/.github/images/alpine:edge.Dockerfile
new file mode 120000
index 0000000..53292c5
--- /dev/null
+++ b/.github/images/alpine:edge.Dockerfile
@@ -0,0 +1 @@
+alpine.Dockerfile
\ No newline at end of file
diff --git a/.github/images/centos.Dockerfile b/.github/images/centos.Dockerfile
index 2fbb211..3952e53 100644
--- a/.github/images/centos.Dockerfile
+++ b/.github/images/centos.Dockerfile
@@ -1,10 +1,9 @@
-ARG image=centos:8
-FROM $image
+ARG image=centos/centos:latest
+FROM quay.io/$image
 
 # Install dependencies
 RUN yum update -y
-RUN yum groupinstall -y 'Development Tools'
-RUN yum install -y autoconf automake findutils libtool
+RUN yum install -y autoconf automake gcc libtool make
 
 # Add source code
 ADD . /src
@@ -16,4 +15,3 @@ RUN ./configure
 RUN make
 RUN make check
 RUN make distcheck
-
diff --git a/.github/images/centos/centos:7.Dockerfile b/.github/images/centos/centos:7.Dockerfile
new file mode 120000
index 0000000..50cd910
--- /dev/null
+++ b/.github/images/centos/centos:7.Dockerfile
@@ -0,0 +1 @@
+../centos.Dockerfile
\ No newline at end of file
diff --git a/.github/images/centos/centos:stream8.Dockerfile b/.github/images/centos/centos:stream8.Dockerfile
new file mode 120000
index 0000000..50cd910
--- /dev/null
+++ b/.github/images/centos/centos:stream8.Dockerfile
@@ -0,0 +1 @@
+../centos.Dockerfile
\ No newline at end of file
diff --git a/.github/images/centos:7.Dockerfile b/.github/images/centos:7.Dockerfile
deleted file mode 120000
index 30ee1a5..0000000
--- a/.github/images/centos:7.Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-centos.Dockerfile
\ No newline at end of file
diff --git a/.github/images/centos:8.Dockerfile b/.github/images/centos:8.Dockerfile
deleted file mode 120000
index 30ee1a5..0000000
--- a/.github/images/centos:8.Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-centos.Dockerfile
\ No newline at end of file
diff --git a/.github/images/debian:stretch.Dockerfile b/.github/images/debian:bookworm.Dockerfile
similarity index 100%
rename from .github/images/debian:stretch.Dockerfile
rename to .github/images/debian:bookworm.Dockerfile
diff --git a/.github/images/ubuntu:xenial.Dockerfile b/.github/images/debian:bullseye.Dockerfile
similarity index 100%
rename from .github/images/ubuntu:xenial.Dockerfile
rename to .github/images/debian:bullseye.Dockerfile
diff --git a/.github/images/fedora/fedora:33.Dockerfile b/.github/images/fedora/fedora:33.Dockerfile
new file mode 120000
index 0000000..50cd910
--- /dev/null
+++ b/.github/images/fedora/fedora:33.Dockerfile
@@ -0,0 +1 @@
+../centos.Dockerfile
\ No newline at end of file
diff --git a/.github/images/fedora/fedora:34.Dockerfile b/.github/images/fedora/fedora:34.Dockerfile
new file mode 120000
index 0000000..50cd910
--- /dev/null
+++ b/.github/images/fedora/fedora:34.Dockerfile
@@ -0,0 +1 @@
+../centos.Dockerfile
\ No newline at end of file
diff --git a/.github/images/fedora:30.Dockerfile b/.github/images/fedora:30.Dockerfile
deleted file mode 120000
index 30ee1a5..0000000
--- a/.github/images/fedora:30.Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-centos.Dockerfile
\ No newline at end of file
diff --git a/.github/images/fedora:31.Dockerfile b/.github/images/fedora:31.Dockerfile
deleted file mode 120000
index 30ee1a5..0000000
--- a/.github/images/fedora:31.Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-centos.Dockerfile
\ No newline at end of file
diff --git a/.github/images/rockylinux/rockylinux:8.Dockerfile b/.github/images/rockylinux/rockylinux:8.Dockerfile
new file mode 120000
index 0000000..50cd910
--- /dev/null
+++ b/.github/images/rockylinux/rockylinux:8.Dockerfile
@@ -0,0 +1 @@
+../centos.Dockerfile
\ No newline at end of file
diff --git a/.github/images/ubuntu:focal.Dockerfile b/.github/images/ubuntu:focal.Dockerfile
new file mode 120000
index 0000000..504b510
--- /dev/null
+++ b/.github/images/ubuntu:focal.Dockerfile
@@ -0,0 +1 @@
+debian.Dockerfile
\ No newline at end of file
diff --git a/.github/workflows/matrixbuild.yml b/.github/workflows/matrixbuild.yml
index ba8f72c..a02351c 100644
--- a/.github/workflows/matrixbuild.yml
+++ b/.github/workflows/matrixbuild.yml
@@ -9,14 +9,18 @@ jobs:
       fail-fast: false
       matrix:
         dockerenv:
+          - debian:bookworm
+          - debian:bullseye
           - debian:buster
-          - debian:stretch
+          - ubuntu:focal
           - ubuntu:bionic
-          - ubuntu:xenial
-          - centos:8
-          - centos:7
-          - fedora:31
-          - fedora:30
+          - fedora/fedora:34
+          - fedora/fedora:33
+          - centos/centos:stream8
+          - centos/centos:7
+          - rockylinux/rockylinux:8
+          - alpine:edge
+          - alpine:3.14
     steps:
     - uses: actions/checkout@v1
     - name: Run build on ${{matrix.dockerenv}}