diff --git a/deployments/examples/ocis_full/collabora.yml b/deployments/examples/ocis_full/collabora.yml
index 787c15800..3fdbdb360 100644
--- a/deployments/examples/ocis_full/collabora.yml
+++ b/deployments/examples/ocis_full/collabora.yml
@@ -12,7 +12,7 @@ services:
       FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: com.owncloud.api.collaboration
 
   collaboration:
-    image: owncloud/ocis-rolling:${OCIS_DOCKER_TAG:-latest}
+    image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
     networks:
       ocis-net:
     depends_on:
diff --git a/deployments/examples/ocis_full/ocis.yml b/deployments/examples/ocis_full/ocis.yml
index d28923c12..674adf01c 100644
--- a/deployments/examples/ocis_full/ocis.yml
+++ b/deployments/examples/ocis_full/ocis.yml
@@ -6,7 +6,7 @@ services:
         aliases:
           - ${OCIS_DOMAIN:-ocis.owncloud.test}
   ocis:
-    image: owncloud/ocis-rolling:${OCIS_DOCKER_TAG:-latest}
+    image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
     networks:
       ocis-net:
     entrypoint:
diff --git a/deployments/examples/ocis_full/onlyoffice.yml b/deployments/examples/ocis_full/onlyoffice.yml
index f28415598..e50062bfd 100644
--- a/deployments/examples/ocis_full/onlyoffice.yml
+++ b/deployments/examples/ocis_full/onlyoffice.yml
@@ -8,7 +8,7 @@ services:
           - ${WOPISERVER_ONLYOFFICE_DOMAIN:-wopiserver-oo.owncloud.test}
 
   collaboration-oo:
-    image: owncloud/ocis-rolling:${OCIS_DOCKER_TAG:-latest}
+    image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
     networks:
       ocis-net:
     depends_on:
diff --git a/docs/ocis/deployment/ocis_full.md b/docs/ocis/deployment/ocis_full.md
index 882e08017..0ddce1c35 100644
--- a/docs/ocis/deployment/ocis_full.md
+++ b/docs/ocis/deployment/ocis_full.md
@@ -272,7 +272,7 @@ Open https://ocis.owncloud.test in your browser and accept the invalid certifica
 
 ### Clamav Virusscanner
 
-You can add a Clamav Virusscanner to the stack. The service is disabled by default. To enable it, uncomment the `CLAMAV` line in the `docker-compose.yml` file.
+You can add a Clamav Virusscanner to the stack. The service is disabled by default. To enable it, uncomment the `CLAMAV` line in the `.env` file.
 
 ```shell {linenos=table,hl_lines=[3]}
 ## Clamav Settings ##
@@ -353,7 +353,7 @@ S3NG_BUCKET=
 
 #### Use a local minio S3 storage backend
 
-For testing purposes, you can use a local minio S3 storage backend. To enable it, uncomment the `S3NG_MINIO` line in the `docker-compose.yml` file.
+For testing purposes, you can use a local minio S3 storage backend. To enable it, uncomment the `S3NG_MINIO` line in the `.env` file.
 
 The frontend for the minio server is available at `http://minio.owncloud.test` and the access key is `ocis` and the secret key is `ocis-secret`.
 
diff --git a/docs/ocis/development/debugging.md b/docs/ocis/development/debugging.md
index dc33c3d77..eb1f3ee30 100644
--- a/docs/ocis/development/debugging.md
+++ b/docs/ocis/development/debugging.md
@@ -148,10 +148,10 @@ make debug-docker
 export OCIS_DOCKER_TAG=debug
 ```
 3. Change the docker-compose `ocis` or `collaboration` depends on what do you want to debug:
-For example `deployments/examples/ocis_full/docker-compose.yml`
+For example `deployments/examples/ocis_full/ocis.yml`
 ```yaml
   ocis:
-    image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
+    image: ${OCIS_DOCKER_IMAGE:-owncloud/ocis}:${OCIS_DOCKER_TAG:-latest}
     networks:
       ocis-net:
     entrypoint: