diff --git a/.drone.yml b/.drone.yml
index 1031b00c1..109c8519d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,28 +3,76 @@ workspace:
   path: github.com/crusttech/crust
 
 kind: pipeline
-name: crust
+name: docker image build
 
 steps:
-- name: build
-  image: crusttech/crust-builder:latest
-  pull: always
-  environment:
-    CGO_ENABLED: 0
-    GOOS: linux
-    GOARCH: amd64
-  commands:
-  - go build -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime=`date +%FT%T%z` -X github.com/crusttech/crust/internal/version.Version=`git describe --always --tags`" -o build/crust-$GOOS-$GOARCH cmd/crust/*.go
-  - go build -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime=`date +%FT%T%z` -X github.com/crusttech/crust/internal/version.Version=`git describe --always --tags`" -o build/crm-$GOOS-$GOARCH cmd/crm/*.go
-  - go build -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime=`date +%FT%T%z` -X github.com/crusttech/crust/internal/version.Version=`git describe --always --tags`" -o build/messaging-$GOOS-$GOARCH cmd/messaging/*.go
-  - go build -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime=`date +%FT%T%z` -X github.com/crusttech/crust/internal/version.Version=`git describe --always --tags`" -o build/system-$GOOS-$GOARCH cmd/system/*.go
-  - go build -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime=`date +%FT%T%z` -X github.com/crusttech/crust/internal/version.Version=`git describe --always --tags`" -o build/system-cli-$GOOS-$GOARCH cmd/system-cli/*.go
+#- name: build
+#  image: crusttech/crust-builder:latest
+#  pull: always
+#  environment:
+#    CGO_ENABLED: 0
+#    GOOS: linux
+#    GOARCH: amd64
+#  commands:
+#  - go build -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime=`date +%FT%T%z` -X github.com/crusttech/crust/internal/version.Version=`git describe --always --tags`" -o build/crust-$GOOS-$GOARCH cmd/crust/*.go
+#  - go build -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime=`date +%FT%T%z` -X github.com/crusttech/crust/internal/version.Version=`git describe --always --tags`" -o build/crm-$GOOS-$GOARCH cmd/crm/*.go
+#  - go build -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime=`date +%FT%T%z` -X github.com/crusttech/crust/internal/version.Version=`git describe --always --tags`" -o build/messaging-$GOOS-$GOARCH cmd/messaging/*.go
+#  - go build -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime=`date +%FT%T%z` -X github.com/crusttech/crust/internal/version.Version=`git describe --always --tags`" -o build/system-$GOOS-$GOARCH cmd/system/*.go
+#  - go build -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime=`date +%FT%T%z` -X github.com/crusttech/crust/internal/version.Version=`git describe --always --tags`" -o build/system-cli-$GOOS-$GOARCH cmd/system-cli/*.go
+
+- name: api-system
+  image: plugins/docker
+  settings:
+    repo: crusttech/api-system
+    auto_tag: true # generate tag names automatically based on git branch and git tag
+    dockerfile: Dockerfile.api-system
+    username:
+      from_secret: docker_hub_username
+    password:
+      from_secret: docker_hub_password
+
+
+- name: api-crm
+  image: plugins/docker
+  settings:
+    repo: crusttech/api-crm
+    auto_tag: true # generate tag names automatically based on git branch and git tag
+    dockerfile: Dockerfile.api-crm
+    username:
+      from_secret: docker_hub_username
+    password:
+      from_secret: docker_hub_password
+
+- name: api-messaging
+  image: plugins/docker
+  settings:
+    repo: crusttech/api-messaging
+    auto_tag: true # generate tag names automatically based on git branch and git tag
+    dockerfile: Dockerfile.api-messaging
+    username:
+      from_secret: docker_hub_username
+    password:
+      from_secret: docker_hub_password
+
+
+#- name: mono
+#  image: plugins/docker
+#  settings:
+#    repo: crusttech/crust
+#    auto_tag: true # generate tag names automatically based on git branch and git tag
+#    dockerfile: Dockerfile.crust
+#    username:
+#      from_secret: docker_hub_username
+#    password:
+#      from_secret: docker_hub_password
 
 trigger:
-  ref:
-    - "refs/heads/**"
-    - "refs/pull/**"
-    - "refs/tags/**"
+  branch:
+    - master
+  refs:
+    - refs/tags/v20??.*
+  event:
+    - push
 
 ---
 workspace: