diff --git a/.github/workflows/smb-kerberos.yml b/.github/workflows/smb-kerberos.yml
index 97f95301306ef..f7cfd22a0d9c0 100644
--- a/.github/workflows/smb-kerberos.yml
+++ b/.github/workflows/smb-kerberos.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0']
 
-    name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
+    name: php${{ matrix.php-versions }}-smb-kerberos
 
     steps:
       - name: Checkout server
@@ -33,7 +33,7 @@ jobs:
       - name: Pull images
         run: |
           docker pull icewind1991/samba-krb-test-dc
-          docker pull icewind1991/samba-krb-test-apache
+          docker pull icewind1991/samba-krb-test-apache:${{ matrix.php-versions }}
           docker pull icewind1991/samba-krb-test-client
       - name: Setup AD-DC
         run: |
@@ -41,7 +41,7 @@ jobs:
           mkdir data
           sudo chown -R 33 data apps config
           DC_IP=$(./start-dc.sh)
-          ./start-apache.sh $DC_IP $PWD
+          ./start-apache.sh $DC_IP $PWD ${{ matrix.php-versions }}
           echo "DC_IP=$DC_IP" >> $GITHUB_ENV
       - name: Set up Nextcloud
         run: |
diff --git a/apps/files_external/tests/start-apache.sh b/apps/files_external/tests/start-apache.sh
index 2c3e178e2efeb..a3df3596f7027 100755
--- a/apps/files_external/tests/start-apache.sh
+++ b/apps/files_external/tests/start-apache.sh
@@ -2,7 +2,7 @@
 
 docker rm -f apache 2>/dev/null > /dev/null
 
-docker run -d --name apache -v $2:/var/www/html -v /tmp/shared:/shared --dns $1 --hostname httpd.domain.test icewind1991/samba-krb-test-apache 1>&2
+docker run -d --name apache -v $2:/var/www/html -v /tmp/shared:/shared --dns $1 --hostname httpd.domain.test icewind1991/samba-krb-test-apache:$3 1>&2
 APACHE_IP=$(docker inspect apache --format '{{.NetworkSettings.IPAddress}}')
 
 # add the dns record for apache