diff --git a/.drone.yml b/.drone.yml
index 56c3aa7..f64e5d0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,77 +1,74 @@
-workspace:
-  path: /src
+kind: pipeline
+name: build
 
-clone:
-  git:
-    image: plugins/git
-    depth: 50
-    tags: true
+trigger:
+  event:
+    - push
 
-pipeline:
-  build_css:
-    image: webhippie/nodejs
+steps:
+  - name: theme
+    image: node:11-alpine
     pull: true
+    group: build-static
     commands:
+      - apk add yarn
       - cd themes/vikunja
-      - npm install gulp-cli -g
-      - npm install
+      - yarn global add gulp-cli -g
+      - yarn
       - gulp
 
-  build:
+  - name: build
     image: monachus/hugo
     pull: true
     commands:
       - hugo
-    when:
-      event: [ push, tag, pull_request ]
+    depends_on: [ theme ]
 
-  docker:
+  - name: docker
     image: plugins/docker
     pull: true
-    secrets: [ docker_username, docker_password ]
-    repo: vikunja/website
-    tags: [ 'develop' ]
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: vikunja/website
+      tags: [ 'latest' ]
     when:
-      event: [ push, tag ]
-      branch: [ develop ]
+      event: [ push ]
+      branch: [ master ]
+    depends_on: [ build ]
 
-  docker:
-    image: plugins/docker
-    pull: true
-    secrets: [ docker_username, docker_password ]
-    repo: vikunja/website
-    tags: [ 'latest' ]
+  - name: rancher
+    image: peloton/drone-rancher
+    settings:
+      url: http://server01.kolaente.de:8080/v1
+      access_key:
+        from_secret: RANCHER_ACCESS_KEY
+      secret_key:
+        from_secret: RANCHER_SECRET_KEY
+      service: vikunja-website/web
+      docker_image: vikunja/website
+      confirm: true
+    depends_on: [ docker ]
     when:
-      event: [ push, tag ]
+      event: [ push ]
       branch: [ master ]
 
-  rancher:
-    image: peloton/drone-rancher
-    url: http://server01.kolaente.de:8080/v1
-    secrets: [ RANCHER_ACCESS_KEY, RANCHER_SECRET_KEY ]
-    service: vikunja-website/web
-    docker_image: vikunja/website
-    confirm: true
-    when:
-      event: [ push, tag ]
-      branch: [ master ]
-
-  rancher:
-    image: peloton/drone-rancher
-    url: http://server01.kolaente.de:8080/v1
-    secrets: [ RANCHER_ACCESS_KEY, RANCHER_SECRET_KEY ]
-    service: vikunja-website/web-dev
-    docker_image: vikunja/website:develop
-    confirm: true
-    when:
-      event: [ push, tag ]
-      branch: [ develop ]
-
-# Tell people vikunja web was updated
-  telegram:
+  - name: telegram
     image: appleboy/drone-telegram
-    secrets: [ TELEGRAM_TOKEN, TELEGRAM_TO, ]
-    message: >
-      {{repo.owner}}/{{repo.name}}: \[{{build.status}}] Build {{build.number}}
-      {{commit.author}} pushed to {{commit.branch}} {{commit.sha}}: `{{commit.message}}`
-      Build started at {{datetime build.started "2006-Jan-02T15:04:05Z" "GMT+2"}} finished at {{datetime build.finished "2006-Jan-02T15:04:05Z" "GMT+2"}}.
+    depends_on:
+      - rancher
+    settings:
+      token:
+        from_secret: TELEGRAM_TOKEN
+      to:
+        from_secret: TELEGRAM_TO
+      message: >
+        {{repo.owner}}/{{repo.name}}: \[{{build.status}}] Build {{build.number}}
+        {{commit.author}} pushed to {{commit.branch}} {{commit.sha}}: `{{commit.message}}`
+        Build started at {{datetime build.started "2006-Jan-02T15:04:05Z" "GMT+2"}} finished at {{datetime build.finished "2006-Jan-02T15:04:05Z" "GMT+2"}}.
+    when:
+      status:
+        - success
+        - failure
\ No newline at end of file