diff --git a/.drone.star b/.drone.star
index 0cd1b5f4..63e0d9e5 100644
--- a/.drone.star
+++ b/.drone.star
@@ -851,6 +851,12 @@ def phpTests(ctx, testType, withCoverage):
             else:
                 command = "make test-php-integration"
 
+            # Get the first 3 characters of the PHP version (7.4 or 8.0 etc)
+            # And use that for constructing the pipeline name
+            # That helps shorten pipeline names when using owncloud-ci images
+            # that have longer names like 7.4-ubuntu20.04
+            phpVersionForPipelineName = phpVersion[0:3]
+
             for server in params["servers"]:
                 for db in params["databases"]:
                     keyString = "-" + category if params["includeKeyInMatrixName"] else ""
@@ -858,7 +864,7 @@ def phpTests(ctx, testType, withCoverage):
                         serverString = "-%s" % server.replace("daily-", "").replace("-qa", "")
                     else:
                         serverString = ""
-                    name = "%s%s-php%s%s-%s" % (testType, keyString, phpVersion, serverString, db.replace(":", ""))
+                    name = "%s%s-php%s%s-%s" % (testType, keyString, phpVersionForPipelineName, serverString, db.replace(":", ""))
                     maxLength = 50
                     nameLength = len(name)
                     if nameLength > maxLength:
@@ -1130,12 +1136,19 @@ def acceptance(ctx):
                     continue
 
                 name = "unknown"
+                phpVersionForDocker = testConfig["phpVersion"]
+
+                # Get the first 3 characters of the PHP version (7.4 or 8.0 etc)
+                # And use that for constructing the pipeline name
+                # That helps shorten pipeline names when using owncloud-ci images
+                # that have longer names like 7.4-ubuntu20.04
+                phpVersionForPipelineName = phpVersionForDocker[0:3]
                 if isWebUI or isAPI or isCLI:
                     esString = "-es" + testConfig["esVersion"] if testConfig["esVersion"] != "none" else ""
                     browserString = "" if testConfig["browser"] == "" else "-" + testConfig["browser"]
                     keyString = "-" + category if testConfig["includeKeyInMatrixName"] else ""
                     partString = "" if testConfig["numberOfParts"] == 1 else "-%d-%d" % (testConfig["numberOfParts"], testConfig["runPart"])
-                    name = "%s%s%s-%s%s-%s-php%s%s" % (alternateSuiteName, keyString, partString, testConfig["server"].replace("daily-", "").replace("-qa", ""), browserString, testConfig["database"].replace(":", ""), testConfig["phpVersion"], esString)
+                    name = "%s%s%s-%s%s-%s-php%s%s" % (alternateSuiteName, keyString, partString, testConfig["server"].replace("daily-", "").replace("-qa", ""), browserString, testConfig["database"].replace(":", ""), phpVersionForPipelineName, esString)
                     maxLength = 50
                     nameLength = len(name)
                     if nameLength > maxLength:
@@ -1203,11 +1216,11 @@ def acceptance(ctx):
                     "steps": skipIfUnchanged(ctx, "acceptance-tests") +
                              installCore(ctx, testConfig["server"], testConfig["database"], testConfig["useBundledApp"]) +
                              installTestrunner(ctx, DEFAULT_PHP_VERSION, testConfig["useBundledApp"]) +
-                             (installFederated(testConfig["server"], testConfig["phpVersion"], testConfig["logLevel"], testConfig["database"], federationDbSuffix) + owncloudLog("federated") if testConfig["federatedServerNeeded"] else []) +
-                             installAppPhp(ctx, testConfig["phpVersion"]) +
+                             (installFederated(testConfig["server"], phpVersionForDocker, testConfig["logLevel"], testConfig["database"], federationDbSuffix) + owncloudLog("federated") if testConfig["federatedServerNeeded"] else []) +
+                             installAppPhp(ctx, phpVersionForDocker) +
                              installAppJavaScript(ctx) +
-                             installExtraApps(testConfig["phpVersion"], testConfig["extraApps"]) +
-                             setupServerAndApp(ctx, testConfig["phpVersion"], testConfig["logLevel"], testConfig["federatedServerNeeded"], params["enableApp"]) +
+                             installExtraApps(phpVersionForDocker, testConfig["extraApps"]) +
+                             setupServerAndApp(ctx, phpVersionForDocker, testConfig["logLevel"], testConfig["federatedServerNeeded"], params["enableApp"]) +
                              owncloudLog("server") +
                              setupCeph(testConfig["cephS3"]) +
                              setupScality(testConfig["scalityS3"]) +
@@ -1215,7 +1228,7 @@ def acceptance(ctx):
                              testConfig["extraSetup"] +
                              waitForServer(testConfig["federatedServerNeeded"]) +
                              waitForEmailService(testConfig["emailNeeded"]) +
-                             fixPermissions(testConfig["phpVersion"], testConfig["federatedServerNeeded"], params["selUserNeeded"]) +
+                             fixPermissions(phpVersionForDocker, testConfig["federatedServerNeeded"], params["selUserNeeded"]) +
                              waitForBrowserService(testConfig["browser"]) +
                              [
                                  ({
@@ -1241,9 +1254,9 @@ def acceptance(ctx):
                                 scalityService(testConfig["scalityS3"]) +
                                 elasticSearchService(testConfig["esVersion"]) +
                                 testConfig["extraServices"] +
-                                owncloudService(testConfig["server"], testConfig["phpVersion"], "server", dir["server"], testConfig["ssl"], testConfig["xForwardedFor"]) +
+                                owncloudService(testConfig["server"], phpVersionForDocker, "server", dir["server"], testConfig["ssl"], testConfig["xForwardedFor"]) +
                                 ((
-                                    owncloudService(testConfig["server"], testConfig["phpVersion"], "federated", dir["federated"], testConfig["ssl"], testConfig["xForwardedFor"]) +
+                                    owncloudService(testConfig["server"], phpVersionForDocker, "federated", dir["federated"], testConfig["ssl"], testConfig["xForwardedFor"]) +
                                     databaseServiceForFederation(testConfig["database"], federationDbSuffix)
                                 ) if testConfig["federatedServerNeeded"] else []),
                     "depends_on": [],