diff --git a/README.md b/README.md
index ebf832bb..e6c151b2 100644
--- a/README.md
+++ b/README.md
@@ -108,11 +108,10 @@ python -m cara.apps.calculator --prefix=/mycalc
 
 ```
 pip install -e .   # At the root of the repository
-voila ./app/cara.ipynb
+voila cara/apps/expert/cara.ipynb --port=8080
 ```
 
-
-Then visit http://localhost:8080/calculator.
+Then visit http://localhost:8080.
 
 
 ### Running the tests
@@ -128,8 +127,8 @@ pytest ./cara
 
 ```
 s2i build file://$(pwd) --copy --keep-symlinks --context-dir ./app-config/nginx/ centos/nginx-112-centos7 cara-nginx-app
-s2i build file://$(pwd) --copy --keep-symlinks --context-dir ./ centos/python-36-centos7 cara-webservice
-s2i build file://$(pwd) --copy --keep-symlinks --context-dir ./app-config/auth-service centos/python-36-centos7 auth-service
+docker build . -f ./app-config/cara-webservice/Dockerfile -t cara-webservice
+docker build ./app-config/auth-service -t auth-service
 ```
 
 Get the client secret from the CERN Application portal for the `cara-test` app. See [CERN-SSO-integration](#CERN-SSO-integration) for more info.
diff --git a/app-config/cara-webservice/app.sh b/app-config/cara-webservice/app.sh
index 738415f6..879a8571 100755
--- a/app-config/cara-webservice/app.sh
+++ b/app-config/cara-webservice/app.sh
@@ -18,7 +18,7 @@ if [[ "$APP_NAME" == "cara-webservice" ]]; then
     python -m cara.apps.calculator "${args[@]}"
 elif [[ "$APP_NAME" == "cara-voila" ]]; then
     echo "Starting the voila service"
-    voila app/ --port=8080 --no-browser --base_url=/voila-server/ --Voila.tornado_settings="{'allow_origin': '*'}"
+    voila cara/apps/expert/ --port=8080 --no-browser --base_url=/voila-server/ --tornado_settings 'allow_origin=*'
 else
     echo "No APP_NAME specified"
     exit 1
diff --git a/app/cara.ipynb b/cara/apps/expert/cara.ipynb
similarity index 100%
rename from app/cara.ipynb
rename to cara/apps/expert/cara.ipynb
diff --git a/app/static b/cara/apps/expert/static
similarity index 100%
rename from app/static
rename to cara/apps/expert/static