diff --git a/Makefile b/Makefile
index 4b27665..8a099f5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,8 @@
-docker_build:
-	sudo docker build -t surveil_image .
+down:
+	- sudo fig kill
 
-docker_rebuild:
-	sudo docker build --no-cache=true -t surveil_image .
-
-docker_kill:
-	- sudo docker stop surveil
-	- sudo docker rm surveil
-
-docker_run: docker_kill docker_build
-	sudo docker run -d -t --name surveil surveil_image
-	sudo docker inspect --format='{{.NetworkSettings.IPAddress}}' surveil
-
-docker_run_interactive: docker_kill docker_build
-	sudo docker run -i -t --name surveil surveil_image bash
+up:
+	sudo fig up &
 
 test: clean
 	tox
diff --git a/doc/source/getting_started.rst b/doc/source/getting_started.rst
index 5eccdfb..0b799dc 100644
--- a/doc/source/getting_started.rst
+++ b/doc/source/getting_started.rst
@@ -8,12 +8,11 @@ Getting Started
 Developpement environnement
 ===========================
 
-Surveil's developpement environnement is based on Docker. There is a Makefile
+Surveil's developpement environnement is based on Docker and fig. There is a Makefile
 at  the root of the repository with commands to make it easier to use:
 
-* :bash:`make docker_run`: Launch Surveil inside a container in non-interactive mode.
-* :bash:`make docker_run_interactive`: Launch Surveil inside a container in interactive mode. You will have to start the services yourself.
-* :bash:`make docker_kill`: Kill the active docker containers, if any.
+* :bash:`make up`: Launch Surveil and its dependencies in containers.
+* :bash:`make down`: Kill the active docker containers, if any.
 
 Configuration for the different services running in the Docker container are
 stored in tools/docker.
diff --git a/fig.yml b/fig.yml
index b975ded..366e49a 100644
--- a/fig.yml
+++ b/fig.yml
@@ -3,8 +3,14 @@ surveil:
   links:
    - mongo
    - influxdb
+  ports:
+   - "8080:8080"
+   - "80:80"
+   - "7767:7767"
+
 mongo:
   image: mongo
+
 influxdb:
   image: tutum/influxdb
   environment: