diff --git a/.drone.star b/.drone.star
index 841a1a1883..51b8179203 100644
--- a/.drone.star
+++ b/.drone.star
@@ -31,12 +31,14 @@ config = {
         'webUIFiles',
         'webUILogin',
         'webUINotifications',
-        'webUIAccount',
         'webUIPrivateLinks',
       ],
       'phoenixWebUI3': [
+        'webUIAccount',
         'webUIRenameFiles',
         'webUIRenameFolders',
+      ],
+       'phoenixWebUI4': [
         'webUITrashbin',
         'webUIUpload',
         # All tests in the following suites are skipped currently
@@ -81,6 +83,17 @@ def getCoreApiTestPipelineNames():
     names.append('Core-API-Tests-ocis-storage-%s' % runPart)
   return names
 
+def getDependsOnAllTestPipelines(ctx):
+  dependencies = getTestSuiteNames() + [ 'upload-coverage' ]
+  if ctx.build.ref != "refs/heads/master":
+    dependencies = getTestSuiteNames() + [
+      'upload-coverage',
+      'localApiTests-owncloud-storage',
+      'localApiTests-ocis-storage',
+    ] + getCoreApiTestPipelineNames() + getUITestSuiteNames()
+
+  return dependencies
+
 def main(ctx):
   pipelines = []
   before = testPipelines(ctx)
@@ -341,7 +354,6 @@ def localApiTests(ctx, coreBranch = 'master', coreCommit = '', storage = 'ownclo
     ],
     'trigger': {
       'ref': [
-        'refs/heads/master',
         'refs/tags/v*',
         'refs/pull/**',
       ],
@@ -397,7 +409,6 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n
     ],
     'trigger': {
       'ref': [
-        'refs/heads/master',
         'refs/tags/v*',
         'refs/pull/**',
       ],
@@ -478,7 +489,6 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = '', stor
     ],
     'trigger': {
       'ref': [
-        'refs/heads/master',
         'refs/tags/v*',
         'refs/pull/**',
       ],
@@ -548,12 +558,7 @@ def docker(ctx, arch):
         'temp': {},
       },
     ],
-    'depends_on':
-      getTestSuiteNames() + [
-      'upload-coverage',
-      'localApiTests-owncloud-storage',
-      'localApiTests-ocis-storage',
-    ] + getCoreApiTestPipelineNames() + getUITestSuiteNames(),
+    'depends_on': getDependsOnAllTestPipelines(ctx),
     'trigger': {
       'ref': [
         'refs/heads/master',
@@ -704,12 +709,7 @@ def binary(ctx, name):
         'temp': {},
       },
     ],
-    'depends_on':
-      getTestSuiteNames() + [
-      'upload-coverage',
-      'localApiTests-owncloud-storage',
-      'localApiTests-ocis-storage',
-    ] + getCoreApiTestPipelineNames() + getUITestSuiteNames(),
+    'depends_on': getDependsOnAllTestPipelines(ctx),
     'trigger': {
       'ref': [
         'refs/heads/master',