diff --git a/.github/workflows/references.yml b/.github/workflows/references.yml
index 6e60547..da4209f 100644
--- a/.github/workflows/references.yml
+++ b/.github/workflows/references.yml
@@ -10,6 +10,16 @@ jobs:
   references:
     name: Generate References
     runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - "39"
+          - "40"
+          - "41"
+          - "rawhide"
+        session:
+          - "gnome-xsession"
     steps:
       - uses: actions/checkout@v4
       - name: Download Dependencies
@@ -19,8 +29,8 @@ jobs:
       - name: Build Burn-My-Windows
         run: make
       - name: Generate References
-        run: sudo make references
+        run: sudo $GITHUB_WORKSPACE/tests/generate-references.sh -v ${{ matrix.version }} -s ${{ matrix.session }}
       - uses: actions/upload-artifact@v3
         with:
-          name: references
+          name: references-${{ matrix.version }}-${{ matrix.session }}
           path: tests/references/
diff --git a/Makefile b/Makefile
index b73b675..10e9a1c 100644
--- a/Makefile
+++ b/Makefile
@@ -46,28 +46,6 @@ pot: $(JS_FILES) $(UI_FILES)
 	          --output=po/$(NAME).pot \
 	          $(JS_FILES) $(UI_FILES)
 
-# This runs several tests in containerized versions of GNOME Shell.
-test:
-	@ for version in 39 "rawhide" ; do \
-	  for session in "gnome-xsession" "gnome-wayland-nested" ; do \
-	    echo ; \
-	    echo "Running Tests on Fedora $$version ($$session)." ; \
-	    echo ; \
-	    ./tests/run-test.sh -s $$session -v $$version ; \
-	  done \
-	done
-
-# This re-generates all reference images required by the tests.
-references:
-	@ for version in 39 "rawhide" ; do \
-	  for session in "gnome-xsession" "gnome-wayland-nested" ; do \
-	    echo ; \
-	    echo "Generating References for Fedora $$version ($$session)." ; \
-	    echo ; \
-	    ./tests/generate-references.sh -s $$session -v $$version ; \
-	  done \
-	done
-
 # This removes all temporary files created with the other recipes.
 clean:
 	rm -rf $(ZIP_NAME) \
diff --git a/tests/generate-references.sh b/tests/generate-references.sh
index dab097b..24114a2 100755
--- a/tests/generate-references.sh
+++ b/tests/generate-references.sh
@@ -60,7 +60,7 @@ EFFECT_CROP="100x100+900+500"
 PREFS_CROP="100x100+700+300"
 
 # Run the container. For more info, visit https://github.com/Schneegans/gnome-shell-pod.
-POD=$(podman run --rm --cap-add=SYS_NICE --cap-add=IPC_LOCK -td "${IMAGE}")
+POD=$(podman run --rm --cap-add=SYS_NICE --cap-add=IPC_LOCK --cap-add=CAP_SYS_ADMIN -td "${IMAGE}")
 
 # Properly shutdown podman when this script is exited.
 quit() {