diff --git a/nextcloud/colabora.apache b/nextcloud/colabora.apache
deleted file mode 100644
index 30b0f8c..0000000
--- a/nextcloud/colabora.apache
+++ /dev/null
@@ -1,34 +0,0 @@
-
-	########################################
-	# Reverse proxy for Collabora Online   #
-	########################################
-
-	AllowEncodedSlashes NoDecode
-	ProxyPreserveHost On
-
-	# static html, js, images, etc. served from coolwsd
-	# browser is the client part of Collabora Online
-	ProxyPass           /browser http://127.0.0.1:9980/browser retry=0
-	ProxyPassReverse    /browser http://127.0.0.1:9980/browser
-
-	# WOPI discovery URL
-	ProxyPass           /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0
-	ProxyPassReverse    /hosting/discovery http://127.0.0.1:9980/hosting/discovery
-
-	# Capabilities
-	ProxyPass           /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0
-	ProxyPassReverse    /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities
-
-	# Main websocket
-	ProxyPassMatch      "/cool/(.*)/ws$"      ws://127.0.0.1:9980/cool/$1/ws nocanon
-
-	# Admin Console websocket
-	ProxyPass           /cool/adminws ws://127.0.0.1:9980/cool/adminws
-
-	# Download as, Fullscreen presentation and Image upload operations
-	ProxyPass           /cool http://127.0.0.1:9980/cool
-	ProxyPassReverse    /cool http://127.0.0.1:9980/cool
-	# Compatibility with integrations that use the /lool/convert-to endpoint
-	ProxyPass           /lool http://127.0.0.1:9980/cool
-	ProxyPassReverse    /lool http://127.0.0.1:9980/cool
-
diff --git a/nextcloud/make.sh b/nextcloud/make.sh
index 3f92c85..aa1ff7d 100755
--- a/nextcloud/make.sh
+++ b/nextcloud/make.sh
@@ -130,6 +130,18 @@ pctPushAssets $ID
 # Colabora...
 if false ; then
 	echo "# Colabora office..."
+	# apache2...
+	@ lxc-attach $ID -- a2enmod proxy
+	@ lxc-attach $ID -- a2enmod proxy_http
+	@ lxc-attach $ID -- a2enmod proxy_connect
+	@ lxc-attach $ID -- a2enmod proxy_wstunnel
+	# XXX TEST... 
+	@ lxc-attach $ID -- bash -c "\
+		sed -i \
+			'/<VirtualHost \*:443>/,/<\/VirtualHost>/ { 
+				/<\/VirtualHost>/ iInclude /etc/apache2/conf-available/coolwsd.conf
+			}' /etc/apache2/sites-available/nextcloud.conf"
+	
 	# coolwsd...
 	# see:
 	# 	https://sdk.collaboraonline.com/docs/installation/Configuration.html
@@ -156,8 +168,8 @@ if false ; then
 	@ lxc-attach $ID -- turnkey-occ app:install richdocuments
 	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments disable_certificate_verification yes
 	# XXX what variable should we use???
-	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments public_wopi_url "https://${NEXTCLOUD_SUBDOMAIN}${DOMAIN}"
-	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments wopi_url "https://${NEXTCLOUD_SUBDOMAIN}${DOMAIN}"
+	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments public_wopi_url "https://${APP_DOMAIN}"
+	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments wopi_url "https://${APP_DOMAIN}"
 	# XXX do we need this???
 	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments types prevent_group_restriction 
 	@ lxc-attach $ID -- turnkey-occ config:app:set richdocuments enabled yes