diff --git a/calendar/README.md b/calendar/README.md
new file mode 100644
index 0000000..cc924a7
--- /dev/null
+++ b/calendar/README.md
@@ -0,0 +1 @@
+# This is for the moment only for testing purposes
\ No newline at end of file
diff --git a/web/kweb-override.yml b/calendar/calendar.yml
similarity index 80%
rename from web/kweb-override.yml
rename to calendar/calendar.yml
index cd3575e..e9b49d3 100644
--- a/web/kweb-override.yml
+++ b/calendar/calendar.yml
@@ -2,7 +2,7 @@ version: "3.5"
 services:
   web:
     volumes:
-      - ./web/kweb-calendar.cfg:/etc/kweb-extras/kweb-calendar.cfg
+      - ./calendar/kweb-calendar.cfg:/etc/kweb-extras/kweb-calendar.cfg
       - ./kopano-calendar-0.20.0/:/usr/share/kopano-calendar/
       - ./kopano-calendar-0.20.0/config.json.in:/var/www/api/config/v1/kopano/calendar/config.json
   kopano_grapi:
diff --git a/web/kweb-calendar.cfg b/calendar/kweb-calendar.cfg
similarity index 80%
rename from web/kweb-calendar.cfg
rename to calendar/kweb-calendar.cfg
index b1ba7fd..5987ed2 100644
--- a/web/kweb-calendar.cfg
+++ b/calendar/kweb-calendar.cfg
@@ -1,2 +1 @@
 staticpwa /calendar /usr/share/kopano-calendar/calendar-webapp
-root /var/www/
diff --git a/owncloud/99-oidc.sh b/owncloud/99-oidc.sh
new file mode 100755
index 0000000..0481d2b
--- /dev/null
+++ b/owncloud/99-oidc.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+echo "Configuring OIDC for kopano-docker"
+
+set -x
+
+occ app:enable openidconnect
+
+true
diff --git a/owncloud/owncloud-phoenix.yml b/owncloud/owncloud-phoenix.yml
index 2a77f37..fb319ae 100644
--- a/owncloud/owncloud-phoenix.yml
+++ b/owncloud/owncloud-phoenix.yml
@@ -1,8 +1,16 @@
+# This is for the moment only for testing purposes. Starts owncloud with the phoenix ui (available from /files) and the owncloud openid component (not yet public).
+# Both parts need to be extracted into the owncloud directory
+# TODO when this is final, these parts should be part of the owncloud docker image (maybe just need to be enabled as apps)
 version: "3.5"
 services:
   owncloud:
     volumes:
+      - ./owncloud/99-oidc.sh:/etc/owncloud.d/99-oidc.sh
       - ./owncloud/openidconnect/:/mnt/data/apps/openidconnect/
-      - ./owncloud/phoenix/:/mnt/data/apps/phoenix/
       - ./owncloud/konnectd.config.php:/mnt/data/config/konnectd.config.php
+      - ./owncloud/phoenix/:/mnt/data/apps/phoenix/
       - ./owncloud/config.json:/mnt/data/apps/phoenix/config.json
+  web:
+    volumes:
+      - ./owncloud/phoenix/:/var/www/files/
+      - ./owncloud/config.json:/var/www/files/config.json
diff --git a/web/README.md b/web/README.md
index 67b4288..bc4af16 100644
--- a/web/README.md
+++ b/web/README.md
@@ -13,6 +13,10 @@ Example:
 DEFAULTREDIRECT=/meet
 ```
 
+## Serving additional files
+
+Kweb in the Web container can easily be extended to serve static content. By default it will serve all content that has been copied into `/var/www/`. To extend the built in configuration file just add an additional file into `/etc/kweb-extras/`. Kweb is using the [Caddyfile syntax](https://caddyserver.com/v1/docs/caddyfile).
+
 ## Information needed when not running your own reverse proxy
 
-The `kopano_webapp` container is accessible on port 9080 and serves the WebApp on `/webapp`.
\ No newline at end of file
+The `kopano_webapp` container is accessible on port 9080 and serves the WebApp on `/webapp`.
diff --git a/web/kweb.cfg b/web/kweb.cfg
index 9fd5c08..5212e29 100644
--- a/web/kweb.cfg
+++ b/web/kweb.cfg
@@ -19,6 +19,9 @@
 		body   50MB
 	}
 
+	# serve static content from /var/www/
+	root /var/www/
+
 	redir 302 {
 		if {path} is /
 		/ {%DEFAULTREDIRECT%}/