diff --git a/.drone.yml b/.drone.yml
index 3877a6553..8aa4b5e17 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,34 +1,17 @@
-clone:
-  git:
-    image: plugins/git
-    depth: 1
+kind: pipeline
+name: handlebars
 
-pipeline:
-  signed-off-check:
-    image: nextcloudci/php7.1:php7.1-16
-    environment:
-      - APP_NAME=activity
-      - 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
-  handlebars:
+steps:
+  - name: check-handlebars-templates
     image: node
     commands:
       - npm install -g handlebars
       - ./check-handlebars-templates.sh
-    when:
-      matrix:
-        TESTS: handlebars
 
-matrix:
-  include:
-    - TESTS: signed-off-check
-    - TESTS: handlebars
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push
diff --git a/.travis.yml b/.travis.yml
index 230453c17..a6000d2d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,8 +60,8 @@ matrix:
       env: DB=mysql;CODECHECK=1
     - php: 7.1
       env: DB=mysql;CODECHECK=2
-    - php: 7.1
-      env: DB=mysql;JSTESTS=1
+#    - php: 7.1
+#      env: DB=mysql;JSTESTS=1
   allow_failures:
     - env: DB=mysql;CODECHECK=2
   fast_finish: true