diff --git a/README.md b/README.md
index 01d4afd..02f4176 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,14 @@
 Example of running [JupyterHub](https://github.com/jupyter/jupyterhub)
 with [GitHub OAuth](https://developer.github.com/v3/oauth/) for authentication.
 
+By default, this image uses `oauthenticator.GitHub`, but you can use a different class by setting `OAUTH_CLASS` in your environment.
+Other configuration parameters, including specific values for your oauth class, can be configured via environment variables.
+For convenience, we include instructions for GITLAB and GITHUB below.
+
+This image uses `DockerSpawner` to launch user servers.
+The result is that each user gets their own isolated container in the server, using the docker image specified in the config.
+For other options (e.g. Kubernetes or local), check out: https://github.com/jupyterhub/jupyterhub#spawners
+
 ## Variables
 
 
@@ -14,7 +22,7 @@ OAUTH_CALLBACK_URL=http://hub.cluster.gsi.dit.upm.es/hub/oauth_callback
 HOST_HOMEDIR=/mnt/home/{username} # {username} will be replaced by the actual OAuth user
 ```
 
-## Gitlab variables:
+### Git lab variables:
 
 ```
 GITLAB_HOST=https://lab.cluster.gsi.dit.upm.es/
@@ -25,7 +33,7 @@ DATASETS_DIR=/home/datasets # READ ONLY
 COMMON_DIR=/home/common # To share files between users
 ```
 
-## GitHub variables:
+### GitHub variables:
 
 ```
 GITHUB_CLIENT_ID=GHId
@@ -33,7 +41,33 @@ GITHUB_CLIENT_SECRET=GHSecret
 OAUTH_CLASS=oauthenticator.github.GitHubOAuthenticator 
 ```
 
-## build
+
+## Docker-compose
+
+This repository includes a docker-compose file to automate building and running the image.
+To use it, save your environment variables to `.env`.
+
+Then, just build the image and run an instance with a single command:
+
+
+```
+docker-compose run --build
+```
+
+
+## Docker-swarm
+
+DockerSpawner works with the old docker-swarm standalone mode, just by mounting your swarm socket to `/var/run/docker.sock`. e.g.:
+
+```
+-v "/var/run/swarm.sock:/var/run/docker.sock"
+```
+
+If you are using the new swarm mode in docker, you might want to check out this issue: https://github.com/jupyterhub/dockerspawner/issues/215
+
+
+## Manual instructions
+### Build
 
 Build the container with:
 
@@ -43,12 +77,7 @@ Alternatively:
 
     docker build -t gsiupm/jupyter-oauth:testing .
 
-### ssl
-
-To run the server on HTTPS, put your ssl key and cert in ssl/ssl.key and
-ssl/ssl.cert.
-
-## run
+### Run
 
 Add your oauth client id, client secret, and callback URL to your `env file` (i.e. `.env`).
 Once you have built the container, you can run it with:
@@ -60,3 +89,31 @@ Alternatively:
     docker run -it -p 8000:8000 --env-file=env gsiupm/jupyter-oauth:testing
 
 Which will run the Jupyter server.
+
+
+### SSL
+
+To run the server on HTTPS, put your ssl key and cert in ssl/ssl.key and
+ssl/ssl.cert.
+
+
+## Useful tweaks
+
+You can add resource limits, e.g.:
+
+```
+c.Spawner.mem_limit = '10G'
+```
+
+## Known issues
+
+If you recreate the jupyterhub image, the token for the jupyterhub server will change, and it may have trouble connecting to user containers.
+We've tried setting the token manually in the config, but it did not work.
+
+As a workaround, you could remove the containers and access them again:
+
+```
+docker ps -a | grep 'jupyter-' | cut -d' ' -f1 | xargs docker rm
+```
+
+Unfortunately, **all unsaved work will be lost**
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..4e05d5c
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '2'
+services:
+  jupyterhub:
+      image: gsiupm/jupyterhub-oauth:testing
+      build: .
+      command: jupyterhub --no-ssl -f /srv/jupyterhub/jupyterhub_config.py
+      hostname: jupyterhub
+      restart_policy: always
+      ports:
+        - "8000:8000"
+      volumes:
+          - "/mnt/home:/home"
+          - "/var/run/docker.sock:/var/run/docker.sock"
+      env:
+          OAUTH_CALLBACK_URL: "https://hub.cluster.gsi.dit.upm.es/hub/oauth_callback"
+          HOST_HOMEDIR: "/mnt/home/{username}"
+          ADMINS: "balkian,oaraque"
+          OAUTH_CLASS: "oauthenticator.gitlab.GitLabOAuthenticator"
+          GITLAB_HOST: "https://lab.cluster.gsi.dit.upm.es/"
+          GITLAB_CLIENT_ID: "${GITLAB_CLIENT_ID}"
+          GITLAB_CLIENT_SECRET: "${GITLAB_CLIENT_SECRET}"
+          JPY_COOKIE_SECRET: "${JPY_COOKIE_SECRET}"
+          JPY_API_TOKEN: "${CONFIGPROXY_AUTH_TOKEN}"
+          OAUTH_TLS_VERIFY: 0
+          COMMON_DIR: "/mnt/home/common"
+          DATASETS_DIR: "/mnt/home/datasets"
diff --git a/jupyterhub_config.py b/jupyterhub_config.py
index f6b59c2..0935ddb 100644
--- a/jupyterhub_config.py
+++ b/jupyterhub_config.py
@@ -43,13 +43,7 @@ import socket
 ips = ([ip for ip in socket.gethostbyname_ex(socket.gethostname())[2] if not ip.startswith("127.")][:1])
 c.JupyterHub.hub_ip = ips[0]
 
-# c.JupyterHub.authenticator_class = 'oauthenticator.{}'.format(auth_class_name)
 c.JupyterHub.authenticator_class = OAUTH_CLASS
-# auth_class = getattr(c, 'auth_class_name')
-# auth_class = getattr(c, 'GitHubOAuthenticator')
-# auth_class.oauth_callback_url = os.environ['OAUTH_CALLBACK_URL']
-# auth_class = getattr(c, auth_short_name)
-# auth_class.create_system_users = False
 
 c.Authenticator.whitelist = whitelist = set()
 c.Authenticator.admin_users = admin = PREADMINS
@@ -61,5 +55,3 @@ if os.path.exists(keyfile):
     c.JupyterHub.ssl_key = keyfile
 if os.path.exists(certfile):
     c.JupyterHub.ssl_cert = certfile
-
-# load_from_json()