diff --git a/.drone.yml b/.drone.yml
index 013ef1100..b5457f210 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,123 +1,140 @@
-clone:
-  git:
-    image: plugins/git
-    depth: 1
+kind: pipeline
+name: app-compatbility
 
-pipeline:
-  signed-off-check:
-    image: nextcloudci/php7.1:php7.1-16
-    environment:
-      - APP_NAME=firstrunwizard
-      - CORE_BRANCH=master
-      - DB=sqlite
-    commands:
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server
-      - php ./build/signed-off-checker.php
-    secrets: [ github_token ]
-    when:
-      matrix:
-        TESTS: signed-off-check
-  check-app-compatbility:
-    image: nextcloudci/php7.1:php7.1-16
-    environment:
-      - APP_NAME=firstrunwizard
-      - CORE_BRANCH=master
-      - DB=sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server
-      # Code checker
-      # FIXME: remote true once default_enable is not throwing an error for appinfo.xml
-      - ./occ app:check-code $APP_NAME -c strong-comparison || true
-      - ./occ app:check-code $APP_NAME -c deprecation || true
-      - cd apps/$APP_NAME/
-    when:
-      matrix:
-        TESTS: check-app-compatbility
-  
-  php7.1:
-    image: nextcloudci/php7.1:php7.1-15
-    environment:
-      - APP_NAME=firstrunwizard
-      - CORE_BRANCH=master
-      - DB=sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/
-      - php occ app:enable $APP_NAME
-      - cd apps/$APP_NAME
-      - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-    when:
-      matrix:
-        TESTS: php7.1
-  php7.2:
-    image: nextcloudci/php7.2:php7.2-9
-    environment:
-      - APP_NAME=firstrunwizard
-      - CORE_BRANCH=master
-      - DB=sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/
-      - php occ app:enable firstrunwizard
-      - cd apps/$APP_NAME
-      - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-    when:
-      matrix:
-        TESTS: php7.2
-  php7.3:
-    image: nextcloudci/php7.3:php7.3-2
-    environment:
-      - APP_NAME=firstrunwizard
-      - CORE_BRANCH=master
-      - DB=sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/
-      - php occ app:enable firstrunwizard
-      - cd apps/$APP_NAME
-      - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-    when:
-      matrix:
-        TESTS: php7.3
-  eslint:
-    image: nextcloudci/node:node-4
-    commands:
-      - npm install
-      - npm run lint
-    when:
-      matrix:
-        TESTS: eslint
-  vue-build:
-    image: nextcloudci/node:node-4
-    commands:
-      - find js/ -type f ! -name 'activate.js' ! -name 'about.js' -delete
-      - npm ci
-      - npm run build
-      - git status
-      - bash -c "[[ ! \"`git status --porcelain js/`\" ]] || ( echo 'Uncommited changes in vue build' && exit 1 )"
-    when:
-      matrix:
-        TESTS: vue-build
+steps:
+- name: check-app-compatbility
+  image: nextcloudci/php7.1:php7.1-16
+  environment:
+    APP_NAME: firstrunwizard
+    CORE_BRANCH: master
+    DB: sqlite
+  commands:
+    # Pre-setup steps
+    - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+    - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+    - cd ../server
+    # Code checker
+    # FIXME: remote true once default_enable is not throwing an error for appinfo.xml
+    - ./occ app:check-code $APP_NAME -c strong-comparison || true
+    - ./occ app:check-code $APP_NAME -c deprecation || true
+    - cd apps/$APP_NAME/
 
-matrix:
-  include:
-    - TESTS: signed-off-check
-    - TESTS: check-app-compatbility
-    - TESTS: php7.1
-    - TESTS: php7.2
-    - TESTS: php7.3
-    - TESTS: eslint
-    - TESTS: vue-build
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
 
-branches: [ master, stable* ]
+---
+kind: pipeline
+name: php7.1
+
+steps:
+- name: php7.1
+  image: nextcloudci/php7.1:php7.1-15
+  environment:
+    APP_NAME: firstrunwizard
+    CORE_BRANCH: master
+    DB: sqlite
+  commands:
+    # Pre-setup steps
+    - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+    - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+    - cd ../server/
+    - php occ app:enable $APP_NAME
+    - cd apps/$APP_NAME
+    - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: php7.2
+
+steps:
+- name: php7.2
+  image: nextcloudci/php7.2:php7.2-9
+  environment:
+    APP_NAME: firstrunwizard
+    CORE_BRANCH: master
+    DB: sqlite
+  commands:
+    # Pre-setup steps
+    - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+    - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+    - cd ../server/
+    - php occ app:enable firstrunwizard
+    - cd apps/$APP_NAME
+    - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: php7.3
+
+steps:
+- name: php7.3
+  image: nextcloudci/php7.3:php7.3-2
+  environment:
+    APP_NAME: firstrunwizard
+    CORE_BRANCH: master
+    DB: sqlite
+  commands:
+    # Pre-setup steps
+    - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+    - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+    - cd ../server/
+    - php occ app:enable firstrunwizard
+    - cd apps/$APP_NAME
+    - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
+
+---
+kind: pipeline
+name: vue
+
+steps:
+- name: eslint
+  image: nextcloudci/node:node-4
+  commands:
+    - npm install
+    - npm run lint
+
+- name: vue-build
+  image: nextcloudci/node:node-4
+  commands:
+    - find js/ -type f ! -name 'activate.js' ! -name 'about.js' -delete
+    - npm ci
+    - npm run build
+    - git status
+    - bash -c "[[ ! \"`git status --porcelain js/`\" ]] || ( echo 'Uncommited changes in vue build' && exit 1 )"
+
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
\ No newline at end of file