diff --git a/docker-compose.yml b/docker-compose.yml
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,29 +5,28 @@
   amqp:
     image: rabbitmq:3.6-management
     ports:
-      - 5018:15672
+      - 5001:5672
+      - 5002:15672
+
+  flower:
+    image: mher/flower
+    command: --broker=amqp://guest:guest@amqp:5672//
+    ports:
+      - 5003:5555
+    depends_on:
+      - amqp
 
   zookeeper:
     image: wurstmeister/zookeeper
-    ports:
-      - "2181:2181"
 
   kafka:
     image: wurstmeister/kafka
     ports:
-      - "9092:9092"
+      - 5004:9092
     env_file: ./kafka.env
     depends_on:
       - zookeeper
 
-  flower:
-    image: mher/flower
-    command: --broker=amqp://guest:guest@amqp:5672//
-    ports:
-      - 5555:5555
-    depends_on:
-      - amqp
-
 # Scheduler
 
   swh-scheduler-db:
@@ -43,7 +42,7 @@
     depends_on:
       - swh-scheduler-db
     ports:
-      - 5008:5008
+      - 5010:5008
 
   swh-scheduler-listener:
     image: swh/scheduler-worker
@@ -75,7 +74,7 @@
     build: ./dockerfiles/swh-storage
     image: swh/storage
     ports:
-      - 5002:5002
+      - 5011:5002
     depends_on:
       - swh-storage-db
       - swh-objstorage
@@ -87,7 +86,7 @@
     build: ./dockerfiles/swh-objstorage
     image: swh/objstorage
     ports:
-      - 5003:5003
+      - 5012:5003
 
 # Indexer storage
 
@@ -101,7 +100,7 @@
     build: ./dockerfiles/swh-indexer-storage
     image: swh/indexer-storage
     ports:
-    - 5007:5007
+      - 5013:5007
     depends_on:
       - swh-idx-storage-db
     environment:
@@ -116,7 +115,7 @@
     build: ./dockerfiles/swh-web
     image: swh/web
     ports:
-      - 8080:5004
+      - 5014:5004
     depends_on:
       - swh-objstorage
       - swh-storage
@@ -130,7 +129,7 @@
     build: ./dockerfiles/swh-deposit
     image: swh/deposit
     ports:
-      - 5006:5006
+      - 5015:5006
     depends_on:
       - swh-deposit-db
       - swh-scheduler-api