diff --git a/Dockerfile b/Dockerfile
index 01e3394..86bd939 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,6 +36,8 @@ RUN cd /opt/surveil && python setup.py develop
 #Set to 'surveil' or 'keystone'
 ENV SURVEIL_AUTH_BACKEND=surveil
 ENV SURVEIL_KEYSTONE_ENDPOINT=127.0.0.1
+ENV SURVEIL_KEYSTONE_USERNAME=admin
+ENV SURVEIL_KEYSTONE_PASSWORD=password
 
 CMD cd /opt/surveil && \
     ./setup.sh && \
diff --git a/tools/docker/surveil_container/setup.sh b/tools/docker/surveil_container/setup.sh
index 8c55877..f3b64c9 100755
--- a/tools/docker/surveil_container/setup.sh
+++ b/tools/docker/surveil_container/setup.sh
@@ -8,6 +8,8 @@ function setup_surveil_api {
         echo -e "=> Setting up Surveil API for keystone authentication..."
         sed -i "s/pipeline =.*/pipeline = authtoken api-server/" /etc/surveil/api_paste.ini
         sed -i "s/auth_uri=.*/auth_uri=${SURVEIL_KEYSTONE_ENDPOINT}/" /etc/surveil/api_paste.ini
+        sed -i "s/admin_user=.*/admin_user=${SURVEIL_KEYSTONE_USERNAME}/" /etc/surveil/api_paste.ini
+        sed -i "s/admin_password=.*/admin_password=${SURVEIL_KEYSTONE_PASSWORD}/" /etc/surveil/api_paste.ini
     fi
 }