diff --git a/doc/docker/development/docker-compose.yml b/doc/docker/development/docker-compose.yml
index 8c08fd46eb..4edf455c74 100644
--- a/doc/docker/development/docker-compose.yml
+++ b/doc/docker/development/docker-compose.yml
@@ -201,6 +201,10 @@ services:
     # needs to be initialised via: docker run --rm -v dev_collabora-config:/mnt --entrypoint '/bin/cp -r /etc/loolwsd /mnt' quay.io/egroupware/collabora-key:stable
     volumes:
     - collabora-config:/etc/loolwsd
+      # support for Collabora/CODE 21.11+
+    - collabora-config:/etc/coolwsd
+    - $PWD/data/default/loolwsd/loolwsd.xml:/etc/coolwsd/coolwsd.xml
+    - $PWD/data/default/loolwsd/loolkitconfig.xcu:/etc/coolwsd/loolkitconfig.xcu
     # dont try to regenerate the (not used certificate) as volumn is readonly
     environment:
     - DONT_GEN_SSL_CERT=1
diff --git a/doc/docker/development/nginx.conf b/doc/docker/development/nginx.conf
index 048fe4a3ce..d53b05afad 100644
--- a/doc/docker/development/nginx.conf
+++ b/doc/docker/development/nginx.conf
@@ -121,6 +121,11 @@ server {
 		proxy_pass http://collabora-key:9980;
 		proxy_set_header Host $http_host;
 	}
+	# Collabora/CODE 21.11+
+	location ^~ /browser {
+		proxy_pass http://collabora-key:9980;
+		proxy_set_header Host $http_host;
+	}
 
 	# WOPI discovery URL
 	location ^~ /hosting/discovery {
@@ -135,6 +140,13 @@ server {
 		proxy_set_header Connection "upgrade";
 		proxy_set_header Host $http_host;
 	}
+	# Collabora/CODE 21.11+
+	location ^~ /cool {
+		proxy_pass http://collabora-key:9980;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection "upgrade";
+		proxy_set_header Host $http_host;
+	}
 
 	# proxy into rocketchat container
 	location /rocketchat {