diff --git a/docker-compose/docker-compose-collabora2.yml b/docker-compose/docker-compose-collabora2.yml
deleted file mode 100644
index 9a77b20..0000000
--- a/docker-compose/docker-compose-collabora2.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-version: '3'
-
-services:
-  collabora:
-    image: collabora/code:latest
-    container_name: collabora
-    restart: unless-stopped
-    networks:
-      - cloud
-    environment:
-      - TZ=Europe/Prague
-      - password=password
-      - username=nextcloud
-      - domain=cloud.martinfencl.eu
-      - extra_params=--o:ssl.enable=false --o:ssl.termination=true
-      - aliasgroup1=https://cloud.martinfencl.eu:443,https://collabora.martinfencl.eu:443
-      - dictionaries=de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru cs_CZ
-    ports:
-      - 9980:9980
-
-networks:
-  cloud:
-    driver: bridge
\ No newline at end of file
diff --git a/nextcloud/update_collabora.yml b/nextcloud/update_collabora.yml
index 182bdbe..55d5111 100644
--- a/nextcloud/update_collabora.yml
+++ b/nextcloud/update_collabora.yml
@@ -13,7 +13,7 @@
 
     # Collabora settings
     collabora_project: collabora
-    collabora_compose_filename: "docker-compose-collabora2.yml"
+    collabora_compose_filename: "docker-compose-collabora.yml"
     collabora_service: collabora
     collabora_port: 9980
 
@@ -26,7 +26,7 @@
 
     - name: Create local archive of docker-compose directory (controller)
       ansible.builtin.archive:
-        path: "{{ compose_local_dir }}/"
+        path: "{{ compose_local_dir }}"
         dest: "/tmp/docker-compose.tar.gz"
         format: gz
       delegate_to: localhost
@@ -43,16 +43,10 @@
         path: "{{ compose_remote_dir }}"
         state: absent
 
-    - name: Ensure remote compose directory exists
-      ansible.builtin.file:
-        path: "{{ compose_remote_dir }}"
-        state: directory
-        mode: "0755"
-
     - name: Extract archive on remote host
       ansible.builtin.unarchive:
         src: "{{ compose_remote_archive }}"
-        dest: "{{ compose_remote_dir }}"
+        dest: "{{ compose_remote_base }}"
         remote_src: true
 
     - name: Pull latest Collabora image
@@ -78,7 +72,7 @@
       ansible.builtin.wait_for:
         host: 127.0.0.1
         port: "{{ collabora_port }}"
-        timeout: 120
+        timeout: 180
 
     - name: Check Collabora discovery endpoint (retry until ready)
       ansible.builtin.uri: