diff --git a/.drone.yml b/.drone.yml
index e8491c6..b6760bb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,25 +1,59 @@
 ---
 kind: pipeline
-type: docker
-name: Build
+name: container-check
 
 steps:
-- name: build
-  image: docker:dind
-  volumes:
-    - name: docker-socket
-      path: /var/run/docker.sock
-  commands:
-  - docker build -t "nikola:${DRONE_TAG}" /drone/src/
+- name: check-build
+  image: plugins/docker
+  settings:
+    registry: scm.project42.io
+    dockerfile: Dockerfile
+    username:
+      from_secret: registry_username
+    password:
+      from_secret: registry_password
+    repo: scm.project42.io/elia/nikola
+    dry_run: true
+    squash: true
+    tags:
+    - "${DRONE_COMMIT_SHA:0:8}"
+
+trigger:
+  exclude:
+    event:
+    - promote
+
+---
+kind: pipeline
+name: container-build
+
+steps:
+- name: build-latest
+  image: plugins/docker
+  settings:
+    registry: scm.project42.io
+    dockerfile: Dockerfile
+    username:
+      from_secret: registry_username
+    password:
+      from_secret: registry_password
+    repo: scm.project42.io/elia/nikola
+    dry_run: true
+    squash: true
+    tags:
+    - latest
+    - "${DRONE_COMMIT_SHA:0:8}"
   when:
     event:
-    - tag
+    - promote
+    target:
+    - production
+
+depends_on:
+  - container-check
 
-volumes:
-- name: docker-socket
-  host:
-    path: /var/run/docker.sock
-      
 trigger:
   event:
-  - tag
\ No newline at end of file
+  - promote
+  target:
+  - production