diff --git a/.drone.yml b/.drone.yml
index 450b7b3..7a6f12c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -52,7 +52,7 @@ steps:
       POUSSETACHES_AUTH_KEY: lol
     commands:
       - sleep 5
-      - 'docker run -p 5006:5005 --net fede -v "`pwd`/tests/fixtures/instance1/config:/app/config" -e MICROBLOGPUB_DEBUG -e MICROBLOGPUB_INTERNAL_HOST -e MICROBLOGPUB_MONGODB_HOST -e POUSSETACHES_AUTH_KEY --name instance1_web microblogpub'
+      - 'docker run -p 5006:5005 --net fede -v "`pwd`/tests/fixtures/instance1/config:/app/config" -e MICROBLOGPUB_DEBUG -e MICROBLOGPUB_INTERNAL_HOST -e MICROBLOGPUB_MONGODB_HOST -e MICROBLOGPUB_POUSSETACHES_HOST -e POUSSETACHES_AUTH_KEY --name instance1_web microblogpub'
 
   - name: microblogpub_instance2
     image: docker:dind
@@ -65,7 +65,7 @@ steps:
       MICROBLOGPUB_MONGODB_HOST: mongo:27017
       POUSSETACHES_AUTH_KEY: lol
     commands:
-      - 'docker run -p 5007:5005 --net fede -v "`pwd`/tests/fixtures/instance2/config:/app/config" -e MICROBLOGPUB_DEBUG -e MICROBLOGPUB_INTERNAL_HOST -e MICROBLOGPUB_MONGODB_HOST -e POUSSETACHES_AUTH_KEY --name instance2_web microblogpub'
+      - 'docker run -p 5007:5005 --net fede -v "`pwd`/tests/fixtures/instance2/config:/app/config" -e MICROBLOGPUB_DEBUG -e MICROBLOGPUB_INTERNAL_HOST -e MICROBLOGPUB_MONGODB_HOST -e MICROBLOGPUB_POUSSETACHES_HOST -e POUSSETACHES_AUTH_KEY --name instance2_web microblogpub'
 
  
   - name: integration_test
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 8a3a677..b41f6c1 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -1,32 +1,14 @@
 version: '3'
 services:
-  flower:
-    image: microblogpub:latest
-    links:
-     - mongo
-     - rabbitmq
-    command: 'celery flower -l info -A tasks --broker amqp://guest@rabbitmq// --address=0.0.0.0 --port=5556'
-    environment:
-     - MICROBLOGPUB_AMQP_BROKER=pyamqp://guest@rabbitmq//
-     - MICROBLOGPUB_MONGODB_HOST=mongo:27017
-    ports:
-     - "5556:5556"
-  celery:
-    image: microblogpub:latest
-    links:
-     - mongo
-     - rabbitmq
-    command: 'celery worker -l info -A tasks'
-    environment:
-     - MICROBLOGPUB_AMQP_BROKER=pyamqp://guest@rabbitmq//
-     - MICROBLOGPUB_MONGODB_HOST=mongo:27017
   mongo:
     image: "mongo:latest"
     volumes:
      - "./data:/data/db"
     ports:
      - "27017:27017"
-  rabbitmq:
-    image: "rabbitmq:latest"
-    ports:
-     - "5672:5672"
+  poussetaches:
+    image: "poussetaches:latest"
+    volumes:
+     - "${DATA_DIR}/poussetaches:/app/poussetaches_data"
+    environment:
+     - POUSSETACHES_AUTH_KEY=${POUSSETACHES_AUTH_KEY}