diff --git a/.env.sample b/.env.sample
index ca26604..59fe2ed 100644
--- a/.env.sample
+++ b/.env.sample
@@ -28,8 +28,6 @@ SECRET_MINIO_RU_VERSION=v1
 SECRET_POSTGRES_P_VERSION=v1
 # DJANGO_HOST_EMAIL_PASSWORD
 SECRET_EMAIL_PASS_VERSION=v1
-# COLLABORA_ADMIN_PASSWORD
-SECRET_COLLABORA_P_VERSION=v1
 
 ##############################################################################
 # EMAIL
@@ -77,9 +75,12 @@ LOGGING_LEVEL_LOGGERS_APP=INFO
 ##############################################################################
 # COLLABORA ADMIN PANEL
 ##############################################################################
-# Username for the Collabora admin panel (https://COLLABORA_DOMAIN/browser/dist/admin/admin.html)
-# Password is managed via Docker secret 'collabora_p'
+# Credentials for the Collabora admin panel (https://COLLABORA_DOMAIN/browser/dist/admin/admin.html)
+# Since collabora 26.04 (image execs coolwsd directly; no shell in the image), the panel
+# password moved from the retired Docker secret 'collabora_p' to this env var.
+# Empty/unset = panel stays locked.
 #COLLABORA_ADMIN_USERNAME=admin
+#COLLABORA_ADMIN_PASSWORD=
 
 ##############################################################################
 # BACKUPS
diff --git a/compose.yml b/compose.yml
index 0f8974c..494f32c 100644
--- a/compose.yml
+++ b/compose.yml
@@ -214,7 +214,7 @@ services:
       - postgres_p
 
   redis:
-    image: redis:8.10.1
+    image: redis:8.10.2
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 10s
@@ -273,13 +273,12 @@ services:
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
 
   collabora:
-    image: collabora/code:25.04.10.3.1
-    entrypoint: >
-      sh -c "
-      export password=\"$$(cat /run/secrets/collabora_p)\" &&
-      exec /start-collabora-online.sh"
+    image: collabora/code:26.04.4.1.1
+    # 26.04 images exec coolwsd directly (--use-env-vars; no shell in the image),
+    # so ssl options are passed as args and the panel password comes from the env.
+    command: ["--o:ssl.enable=false", "--o:ssl.termination=true"]
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:9980/hosting/discovery" ]
+      test: [ "CMD", "/usr/bin/coolwsd", "--probe", "--o:ssl.enable=false" ]
       interval: 30s
       retries: 5
       start_period: 60s
@@ -288,11 +287,9 @@ services:
       - backend
       - proxy
     environment:
-      - extra_params=--o:ssl.enable=false --o:ssl.termination=true
       - username=${COLLABORA_ADMIN_USERNAME:-admin}
       - server_name=${COLLABORA_DOMAIN}
-    secrets:
-      - collabora_p
+      - password=${COLLABORA_ADMIN_PASSWORD:-}
     deploy:
       labels:
       - "traefik.enable=true"
@@ -422,9 +419,6 @@ secrets:
   minio_ru:
     external: true
     name: ${STACK_NAME}_minio_ru_${SECRET_MINIO_RU_VERSION}
-  collabora_p:
-    external: true
-    name: ${STACK_NAME}_collabora_p_${SECRET_COLLABORA_P_VERSION}
   email_pass:
     external: true
     name: ${STACK_NAME}_email_pass_${SECRET_EMAIL_PASS_VERSION}
\ No newline at end of file