diff --git a/.drone.yml b/.drone.yml
index 2193f47..8d91963 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,23 +2,49 @@ kind: pipeline
 type: exec
 name: default
 
+settings:
+  sh_key:
+    from_secret: /home/administrator/.ssh/id_rsa
+
 steps:
-- name: build
-  commands:
-  - docker build  -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)"
-  - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker
+  - name: build_production
+    commands:
+      - docker build  -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" .
+      - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker
+    when:
+      branch:
+        - master
+
+  - name: deploy_production
+    commands:
+      - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d
+      - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update"
+      - docker exec willaengine service cron start
+      - docker exec willaengine php artisan config:cache
+      - docker exec willaengine php artisan route:cache
+    when:
+      branch:
+        - master
+
+  - name: build_staging
+    commands:
+      - docker build  -t registry.willaspace.com/willaspace/${IMAGE_NAME}-staging:latest -f Dockerfile.staging --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" .
+      - docker build  -t registry.willaspace.com/willaspace/${IMAGE_NAME}-staging-nginx:latest -f Dockerfile.nginx .
+    when:
+      branch:
+        - dev
 
-- name: deploy
-  commands:
-  - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d
-  - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update"
-  - docker exec willaengine service cron start
-  - docker exec willaengine php artisan config:cache
-  - docker exec willaengine php artisan route:cache
+  - name: deploy_staging
+    commands:
+      - cd /apps/${IMAGE_NAME}-staging/ ; docker-compose up -d
+    when:
+      branch:
+        - dev
 
 trigger:
   branch:
-  - master
+    - master
+    - dev
 
 environment:
   - IMAGE_NAME=willaengine