diff --git a/tasks/compose.yml b/tasks/compose.yml
index 98387bf..0a6a465 100644
--- a/tasks/compose.yml
+++ b/tasks/compose.yml
@@ -1,53 +1,42 @@
 ---
-- name: Determine Jitsi Compose files
+- name: Build Jitsi Compose file list
   ansible.builtin.set_fact:
     jitsi_compose_files:
       - docker-compose.yml
 
-- name: Enable Jigasi
+- name: Add optional Compose files
   ansible.builtin.set_fact:
-    jitsi_compose_files: "{{ jitsi_compose_files + ['jigasi.yml'] }}"
-  when: jitsi_enable_jigasi
+    jitsi_compose_files: "{{ jitsi_compose_files + [item.file] }}"
+  when: item.enabled | bool
+  loop:
+    - file: jigasi.yml
+      enabled: "{{ jitsi_enable_jigasi }}"
+    - file: jibri.yml
+      enabled: "{{ jitsi_enable_jibri }}"
+    - file: transcriber.yml
+      enabled: "{{ jitsi_enable_transcriber }}"
+    - file: etherpad.yml
+      enabled: "{{ jitsi_enable_etherpad }}"
+    - file: whiteboard.yml
+      enabled: "{{ jitsi_enable_whiteboard }}"
 
-- name: Enable Jibri
+- name: Build Docker Compose arguments
   ansible.builtin.set_fact:
-    jitsi_compose_files: "{{ jitsi_compose_files + ['jibri.yml'] }}"
-  when: jitsi_enable_jibri
-
-- name: Enable transcriber
-  ansible.builtin.set_fact:
-    jitsi_compose_files: "{{ jitsi_compose_files + ['transcriber.yml'] }}"
-  when: jitsi_enable_transcriber
-
-- name: Enable Etherpad
-  ansible.builtin.set_fact:
-    jitsi_compose_files: "{{ jitsi_compose_files + ['etherpad.yml'] }}"
-  when: jitsi_enable_etherpad
-
-- name: Enable whiteboard
-  ansible.builtin.set_fact:
-    jitsi_compose_files: "{{ jitsi_compose_files + ['whiteboard.yml'] }}"
-  when: jitsi_enable_whiteboard
+    jitsi_compose_args: >-
+      {{
+        jitsi_compose_files
+        | map('regex_replace', '^(.*)$', '-f \1')
+        | join(' ')
+      }}
 
 - name: Pull Jitsi images
   ansible.builtin.command:
-    argv:
-      - docker
-      - compose
-      - "{{ item }}"
-      - pull
+    cmd: "docker compose {{ jitsi_compose_args }} pull"
     chdir: "{{ jitsi_install_dir }}"
-  loop: "{{ jitsi_compose_files }}"
   changed_when: true
 
 - name: Start Jitsi
   ansible.builtin.command:
-    argv:
-      - docker
-      - compose
-      - "{{ item }}"
-      - up
-      - -d
+    cmd: "docker compose {{ jitsi_compose_args }} up -d"
     chdir: "{{ jitsi_install_dir }}"
-  loop: "{{ jitsi_compose_files }}"
-  changed_when: true
+  changed_when: true1