diff --git a/.drone.yml b/.drone.yml
index 8debfaf77603..dfa01bae415e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3681,11 +3681,9 @@ steps:
   - bash tests/drone/install-server.sh
   - php occ a:l
   - php occ config:system:set trusted_domains 1 --value=server
-  - php occ config:system:set trusted_domains 2 --value=federated
   - php occ log:manage --level 2
   - php occ config:list
   - php occ security:certificates:import /drone/server.crt
-  - php occ security:certificates:import /drone/federated.crt
   - php occ security:certificates
   environment:
     DB_TYPE: mariadb
@@ -3715,44 +3713,6 @@ steps:
   commands:
   - tail -f /drone/src/data/owncloud.log
 
-- name: install-federated
-  pull: always
-  image: owncloudci/core
-  settings:
-    core_path: /drone/federated
-    exclude: apps/testing
-    version: daily-master-qa
-
-- name: configure-federated
-  pull: always
-  image: owncloudci/php:7.1
-  commands:
-  - cd /drone/federated
-  - php occ a:l
-  - php occ a:e testing
-  - php occ a:l
-  - php occ config:system:set trusted_domains 1 --value=server
-  - php occ config:system:set trusted_domains 2 --value=federated
-  - php occ log:manage --level 2
-  - php occ config:list
-  - echo "export TEST_SERVER_FED_URL=https://federated" > /drone/saved-settings.sh
-  - php occ security:certificates:import /drone/server.crt
-  - php occ security:certificates:import /drone/federated.crt
-  - php occ security:certificates
-
-- name: federated-permissions
-  pull: always
-  image: owncloudci/php:7.1
-  commands:
-  - chown www-data -R /drone/federated
-
-- name: federated-logfile
-  pull: always
-  image: owncloudci/php:7.1
-  detach: true
-  commands:
-  - tail -f /drone/federated/data/owncloud.log
-
 - name: api-acceptance-tests
   pull: always
   image: owncloudci/php:7.1
@@ -3781,22 +3741,6 @@ services:
     APACHE_SSL_KEY: /drone/server.key
     APACHE_WEBROOT: /drone/src
 
-- name: federated
-  pull: always
-  image: owncloudci/php:7.1
-  command:
-  - /usr/local/bin/apachectl
-  - -e
-  - debug
-  - -D
-  - FOREGROUND
-  environment:
-    APACHE_CONFIG_TEMPLATE: ssl
-    APACHE_SSL_CERT: /drone/federated.crt
-    APACHE_SSL_CERT_CN: federated
-    APACHE_SSL_KEY: /drone/federated.key
-    APACHE_WEBROOT: /drone/federated
-
 - name: mariadb
   image: mariadb:10.2
   environment:
@@ -3818,7 +3762,7 @@ depends_on:
 
 ---
 kind: pipeline
-name: behat-headless-10.2.1-fed-apiFederation
+name: behat-headless-master-qa-fed-apiFederation
 
 platform:
   os: linux
@@ -3918,7 +3862,7 @@ steps:
   settings:
     core_path: /drone/federated
     exclude: apps/testing
-    version: 10.2.1
+    version: daily-master-qa
 
 - name: configure-federated
   pull: always
@@ -4015,7 +3959,7 @@ depends_on:
 
 ---
 kind: pipeline
-name: behat-headless-master-qa-fed-apiFederation
+name: behat-headless-10.2.1-fed-apiFederation
 
 platform:
   os: linux
@@ -4075,9 +4019,11 @@ steps:
   - bash tests/drone/install-server.sh
   - php occ a:l
   - php occ config:system:set trusted_domains 1 --value=server
+  - php occ config:system:set trusted_domains 2 --value=federated
   - php occ log:manage --level 2
   - php occ config:list
   - php occ security:certificates:import /drone/server.crt
+  - php occ security:certificates:import /drone/federated.crt
   - php occ security:certificates
   environment:
     DB_TYPE: mariadb
@@ -4107,6 +4053,44 @@ steps:
   commands:
   - tail -f /drone/src/data/owncloud.log
 
+- name: install-federated
+  pull: always
+  image: owncloudci/core
+  settings:
+    core_path: /drone/federated
+    exclude: apps/testing
+    version: 10.2.1
+
+- name: configure-federated
+  pull: always
+  image: owncloudci/php:7.1
+  commands:
+  - cd /drone/federated
+  - php occ a:l
+  - php occ a:e testing
+  - php occ a:l
+  - php occ config:system:set trusted_domains 1 --value=server
+  - php occ config:system:set trusted_domains 2 --value=federated
+  - php occ log:manage --level 2
+  - php occ config:list
+  - echo "export TEST_SERVER_FED_URL=https://federated" > /drone/saved-settings.sh
+  - php occ security:certificates:import /drone/server.crt
+  - php occ security:certificates:import /drone/federated.crt
+  - php occ security:certificates
+
+- name: federated-permissions
+  pull: always
+  image: owncloudci/php:7.1
+  commands:
+  - chown www-data -R /drone/federated
+
+- name: federated-logfile
+  pull: always
+  image: owncloudci/php:7.1
+  detach: true
+  commands:
+  - tail -f /drone/federated/data/owncloud.log
+
 - name: api-acceptance-tests
   pull: always
   image: owncloudci/php:7.1
@@ -4135,6 +4119,22 @@ services:
     APACHE_SSL_KEY: /drone/server.key
     APACHE_WEBROOT: /drone/src
 
+- name: federated
+  pull: always
+  image: owncloudci/php:7.1
+  command:
+  - /usr/local/bin/apachectl
+  - -e
+  - debug
+  - -D
+  - FOREGROUND
+  environment:
+    APACHE_CONFIG_TEMPLATE: ssl
+    APACHE_SSL_CERT: /drone/federated.crt
+    APACHE_SSL_CERT_CN: federated
+    APACHE_SSL_KEY: /drone/federated.key
+    APACHE_WEBROOT: /drone/federated
+
 - name: mariadb
   image: mariadb:10.2
   environment:
@@ -9554,11 +9554,9 @@ steps:
   - bash tests/drone/install-server.sh
   - php occ a:l
   - php occ config:system:set trusted_domains 1 --value=server
-  - php occ config:system:set trusted_domains 2 --value=federated
   - php occ log:manage --level 2
   - php occ config:list
   - php occ security:certificates:import /drone/server.crt
-  - php occ security:certificates:import /drone/federated.crt
   - php occ security:certificates
   environment:
     DB_TYPE: mariadb
@@ -9704,9 +9702,11 @@ steps:
   - bash tests/drone/install-server.sh
   - php occ a:l
   - php occ config:system:set trusted_domains 1 --value=server
+  - php occ config:system:set trusted_domains 2 --value=federated
   - php occ log:manage --level 2
   - php occ config:list
   - php occ security:certificates:import /drone/server.crt
+  - php occ security:certificates:import /drone/federated.crt
   - php occ security:certificates
   environment:
     DB_TYPE: mariadb