diff --git a/Dockerfile b/Dockerfile
index d6ca08f..f652301 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,16 +20,22 @@ RUN apt-get install -y subversion && \
 ADD requirements.txt surveil/requirements.txt
 RUN pip install -r /surveil/requirements.txt
 
-ADD setup.py /surveil/setup.py
-ADD setup.cfg /surveil/setup.cfg
-ADD README.rst /surveil/README.rst
+ADD tools/docker/surveil_container/setup.sh /opt/surveil/setup.sh
+ADD setup.py /opt/surveil/setup.py
+ADD setup.cfg /opt/surveil/setup.cfg
+ADD README.rst /opt/surveil/README.rst
 ADD etc/surveil /etc/surveil
-ADD surveil /surveil/surveil
+ADD surveil /opt/surveil/surveil
 
 #ADD .git /surveil/.git
 ENV PBR_VERSION=PROD
 
 # We are using develop so that the code can be mounted when in DEV.
-RUN cd surveil && python setup.py develop
+RUN cd /opt/surveil && python setup.py develop
 
-CMD surveil-api
+#Set to 'surveil-auth' for surveil-specific auth or set to 'authtoken' for Keystone authentication
+ENV SURVEIL_AUTH_BACKEND=surveil-auth
+
+CMD cd /opt/surveil && \
+    ./setup.sh && \
+    surveil-api
diff --git a/docker-compose.yml b/docker-compose.yml
index c4e8f8a..6020ba8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,8 +9,8 @@ surveil:
   environment:
     PBR_VERSION: "DEV"
   volumes:
-   - ./surveil:/surveil/surveil
-  command: bash -c "cd /surveil/ && python setup.py develop && ((sleep 40 && surveil-init --demo) &) && sleep 20 && surveil-api --reload"
+   - ./surveil:/opt/surveil/surveil
+  command: bash -c "cd /opt/surveil && ./setup.sh && python setup.py develop && ((sleep 40 && surveil-init --demo) &) && sleep 20 && surveil-api --reload"
 
 shinken:
   build: tools/docker/shinken_container/
diff --git a/tools/docker/surveil_container/setup.sh b/tools/docker/surveil_container/setup.sh
new file mode 100755
index 0000000..d82e2de
--- /dev/null
+++ b/tools/docker/surveil_container/setup.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+function setup_surveil_api {
+    sed -i "s/pipeline =.*/pipeline = ${SURVEIL_AUTH_BACKEND} api-server/" /etc/surveil/api_paste.ini
+}
+
+if [ -f "/.surveil_api_setup" ]; then
+    echo "=> Surveil API was already configured, skipping..."
+else
+    echo -e "=> Configuring Surveil API..."
+    setup_surveil_api && touch "/.surveil_api_setup"
+    echo -e "=> Done with API configuration."
+fi