diff --git a/.env.sample b/.env.sample
index 8cee35f..cb3b8d7 100644
--- a/.env.sample
+++ b/.env.sample
@@ -30,8 +30,6 @@ FPM_MAX_SPARE_SERVERS=12
 
 DEFAULT_QUOTA="10 GB"
 
-APPS="calendar"
-
 # X_FRAME_OPTIONS_ENABLED=1
 # X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org
 
@@ -46,26 +44,26 @@ APPS="calendar"
 # MAIL_DOMAIN=
 # SECRET_SMTP_PASSWORD_VERSION=v1
 
-# COLLABORA_URL=https://collabora.example.com
-
-# COMPOSE_FILE="$COMPOSE_FILE:compose.onlyoffice.yml"
+# COMPOSE_FILE="$COMPOSE_FILE:compose.apps.yml"
+# APPS="calendar sociallogin onlyoffice"
+#
 # ONLYOFFICE_URL=https://onlyoffice.example.com
-# APPS="$APPS onlyoffice"
 # SECRET_ONLYOFFICE_JWT_VERSION=v1
-
-# COMPOSE_FILE="$COMPOSE_FILE:compose.bbb.yml"
+#
+# COLLABORA_URL=https://collabora.example.com
+#
 # BBB_URL=https://talk.example.org/bigbluebutton/ # trailing slash!
 # SECRET_BBB_SECRET_VERSION=v1
-
-# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
-# APPS="$APPS sociallogin"
-# AUTHENTIK_USER_PREFIX=authentik
-# AUTHENTIK_DOMAIN=authentik.example.com
-# SECRET_AUTHENTIK_SECRET_VERSION=v1
-# SECRET_AUTHENTIK_ID_VERSION=v1
+#
 # OCC_CMDS="app:disable dashboard"
 # OCC_CMDS="$OCC_CMDS|config:app:set sociallogin auto_create_groups --value 1"
 # OCC_CMDS="$OCC_CMDS|config:app:set sociallogin hide_default_login --value 1"
 
+# COMPOSE_FILE="$COMPOSE_FILE:compose.authentik.yml"
+# AUTHENTIK_USER_PREFIX=authentik
+# AUTHENTIK_DOMAIN=authentik.example.com
+# SECRET_AUTHENTIK_SECRET_VERSION=v1
+# SECRET_AUTHENTIK_ID_VERSION=v1
+
 #COMPOSE_FILE="$COMPOSE_FILE:compose.fulltextsearch.yml"
 #SECRET_ELASTICSEARCH_PASSWORD_VERSION=v1
diff --git a/compose.onlyoffice.yml b/compose.apps.yml
similarity index 61%
rename from compose.onlyoffice.yml
rename to compose.apps.yml
index f1bcb24..b892636 100644
--- a/compose.onlyoffice.yml
+++ b/compose.apps.yml
@@ -3,10 +3,16 @@ services:
   app:
     secrets:
       - onlyoffice_jwt
+      - bbb_secret
     environment:
+      - APPS
       - ONLYOFFICE_URL
+      - BBB_URL
 
 secrets:
   onlyoffice_jwt:
     external: true
     name: ${STACK_NAME}_onlyoffice_jwt_${SECRET_ONLYOFFICE_JWT_VERSION}
+  bbb_secret:
+    external: true
+    name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}
diff --git a/compose.bbb.yml b/compose.bbb.yml
deleted file mode 100644
index fcd7e37..0000000
--- a/compose.bbb.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: "3.8"
-services:
-  app:
-    secrets:
-      - bbb_secret
-    environment:
-      - BBB_URL
-
-secrets:
-  bbb_secret:
-    external: true
-    name: ${STACK_NAME}_bbb_secret_${SECRET_BBB_SECRET_VERSION}