From c7c43407327147f36244c10b13c06d68784112bd Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Mon, 24 Nov 2025 13:36:24 +0000
Subject: [PATCH] Convert scripts to docker-compose

---
 ansible/group_vars/all/docker.yml                    |  7 +------
 ansible/roles/atuin/tasks/main.yml                   |  2 +-
 ansible/roles/baby_buddy/tasks/main.yml              |  2 +-
 ansible/roles/bsky/tasks/main.yml                    |  2 +-
 ansible/roles/comentario/tasks/main.yml              |  2 +-
 ansible/roles/db_auto_backup/tasks/main.yml          |  2 +-
 ansible/roles/docker_cleanup/files/docker-utils/dc   |  2 +-
 .../roles/docker_cleanup/files/docker-utils/dc-all   |  2 +-
 .../files/docker-utils/hard-restart-all              |  6 +++---
 .../docker_cleanup/files/docker-utils/update-all     |  6 +++---
 ansible/roles/docker_cleanup/tasks/main.yml          |  7 -------
 ansible/roles/forgejo/tasks/main.yml                 |  2 +-
 ansible/roles/forgejo_runner/tasks/main.yml          |  2 +-
 ansible/roles/freshrss/tasks/main.yml                |  2 +-
 ansible/roles/immich/tasks/main.yml                  |  2 +-
 ansible/roles/karakeep/tasks/main.yml                |  2 +-
 ansible/roles/macau/tasks/main.yml                   |  2 +-
 ansible/roles/mastodon/files/purge-media.sh          | 12 ++++++------
 ansible/roles/mastodon/tasks/main.yml                |  2 +-
 ansible/roles/ntfy/tasks/main.yml                    |  2 +-
 ansible/roles/plausible/tasks/main.yml               |  2 +-
 ansible/roles/pocket_id/tasks/main.yml               |  2 +-
 ansible/roles/privatebin/tasks/main.yml              |  2 +-
 ansible/roles/prometheus/handlers/main.yml           |  2 +-
 ansible/roles/prometheus/tasks/grafana.yml           |  2 +-
 ansible/roles/prometheus/tasks/prometheus.yml        |  2 +-
 ansible/roles/pve_docker/files/nextcloud/occ         |  2 +-
 ansible/roles/pve_docker/tasks/calibre.yml           |  2 +-
 ansible/roles/pve_docker/tasks/librespeed.yml        |  2 +-
 ansible/roles/pve_docker/tasks/nextcloud.yml         |  2 +-
 ansible/roles/pve_docker/tasks/synapse.yml           |  2 +-
 ansible/roles/pve_docker/tasks/whoami.yml            |  2 +-
 ansible/roles/renovate/tasks/main.yml                |  2 +-
 ansible/roles/slides/tasks/main.yml                  |  2 +-
 ansible/roles/tandoor/tasks/main.yml                 |  2 +-
 ansible/roles/traefik/tasks/main.yml                 |  2 +-
 ansible/roles/uptime_kuma/tasks/main.yml             |  2 +-
 ansible/roles/vaultwarden/tasks/main.yml             |  2 +-
 ansible/roles/vikunja/tasks/main.yml                 |  2 +-
 ansible/roles/website/tasks/main.yml                 |  2 +-
 40 files changed, 48 insertions(+), 60 deletions(-)

diff --git a/ansible/group_vars/all/docker.yml b/ansible/group_vars/all/docker.yml
index 6e04168..d552933 100644
--- a/ansible/group_vars/all/docker.yml
+++ b/ansible/group_vars/all/docker.yml
@@ -8,11 +8,6 @@ docker_users:
 docker_compose_file_mask: "664"
 docker_compose_directory_mask: "775"
 
-# HACK: Use compose-switch as the install for compose, so the commands still work.
-# Run this task manually, as version comparisons usually fail
-docker_compose_url: https://github.com/docker/compose-switch/releases/latest/download/docker-compose-linux-{{ docker_apt_arch }}
-docker_install_compose: false
-
 docker_install_compose_plugin: "{{ ansible_os_family == 'Debian' }}"
 
-docker_update_command: docker-compose pull && docker-compose down --remove-orphans && docker-compose rm && docker-compose up -d
+docker_update_command: docker compose pull && docker compose down --remove-orphans && docker compose rm && docker compose up -d
diff --git a/ansible/roles/atuin/tasks/main.yml b/ansible/roles/atuin/tasks/main.yml
index d9e0cfa..afded43 100644
--- a/ansible/roles/atuin/tasks/main.yml
+++ b/ansible/roles/atuin/tasks/main.yml
@@ -12,5 +12,5 @@
     dest: /opt/atuin/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart atuin
diff --git a/ansible/roles/baby_buddy/tasks/main.yml b/ansible/roles/baby_buddy/tasks/main.yml
index 7c85ba0..f7359d1 100644
--- a/ansible/roles/baby_buddy/tasks/main.yml
+++ b/ansible/roles/baby_buddy/tasks/main.yml
@@ -14,5 +14,5 @@
     dest: /opt/baby-buddy/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart baby-buddy
diff --git a/ansible/roles/bsky/tasks/main.yml b/ansible/roles/bsky/tasks/main.yml
index 43de915..0ce7d2b 100644
--- a/ansible/roles/bsky/tasks/main.yml
+++ b/ansible/roles/bsky/tasks/main.yml
@@ -22,5 +22,5 @@
     dest: /opt/bsky/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart bsky
diff --git a/ansible/roles/comentario/tasks/main.yml b/ansible/roles/comentario/tasks/main.yml
index 90debef..93de30f 100644
--- a/ansible/roles/comentario/tasks/main.yml
+++ b/ansible/roles/comentario/tasks/main.yml
@@ -14,7 +14,7 @@
     dest: /opt/comentario/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart comentario
 
 - name: Install secrets
diff --git a/ansible/roles/db_auto_backup/tasks/main.yml b/ansible/roles/db_auto_backup/tasks/main.yml
index 742da5c..2c5d026 100644
--- a/ansible/roles/db_auto_backup/tasks/main.yml
+++ b/ansible/roles/db_auto_backup/tasks/main.yml
@@ -11,5 +11,5 @@
     dest: /opt/db-auto-backup/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart db-auto-backup
diff --git a/ansible/roles/docker_cleanup/files/docker-utils/dc b/ansible/roles/docker_cleanup/files/docker-utils/dc
index 8a79c17..49cefe0 100755
--- a/ansible/roles/docker_cleanup/files/docker-utils/dc
+++ b/ansible/roles/docker_cleanup/files/docker-utils/dc
@@ -2,4 +2,4 @@
 
 set -e
 
-exec docker-compose -f "/opt/$1/docker-compose.yml" "${@:2}"
+exec docker compose -f "/opt/$1/docker-compose.yml" "${@:2}"
diff --git a/ansible/roles/docker_cleanup/files/docker-utils/dc-all b/ansible/roles/docker_cleanup/files/docker-utils/dc-all
index 78d4c68..927376d 100755
--- a/ansible/roles/docker_cleanup/files/docker-utils/dc-all
+++ b/ansible/roles/docker_cleanup/files/docker-utils/dc-all
@@ -3,5 +3,5 @@
 set -e
 
 for compose_file in /opt/**/docker-compose.yml; do
-    docker-compose -f "$compose_file" "$@"
+    docker compose -f "$compose_file" "$@"
 done
diff --git a/ansible/roles/docker_cleanup/files/docker-utils/hard-restart-all b/ansible/roles/docker_cleanup/files/docker-utils/hard-restart-all
index ebc85d7..2bce84d 100755
--- a/ansible/roles/docker_cleanup/files/docker-utils/hard-restart-all
+++ b/ansible/roles/docker_cleanup/files/docker-utils/hard-restart-all
@@ -3,9 +3,9 @@
 set -e
 
 for compose_file in /opt/**/docker-compose.yml; do
-    if [[ $(docker-compose -f "$compose_file" ps -q) ]]; then
-        docker-compose -f "$compose_file" down --remove-orphans
-        docker-compose -f "$compose_file" up -d
+    if [[ $(docker compose -f "$compose_file" ps -q) ]]; then
+        docker compose -f "$compose_file" down --remove-orphans
+        docker compose -f "$compose_file" up -d
     else
         echo "> Skipping $compose_file as it's not running."
     fi
diff --git a/ansible/roles/docker_cleanup/files/docker-utils/update-all b/ansible/roles/docker_cleanup/files/docker-utils/update-all
index 15088ca..cba7d50 100755
--- a/ansible/roles/docker_cleanup/files/docker-utils/update-all
+++ b/ansible/roles/docker_cleanup/files/docker-utils/update-all
@@ -3,10 +3,10 @@
 set -e
 
 for compose_file in /opt/**/docker-compose.yml; do
-    if [[ $(docker-compose -f "$compose_file" ps -q) ]]; then
+    if [[ $(docker compose -f "$compose_file" ps -q) ]]; then
         echo "> Updating $compose_file"
-        docker-compose -f "$compose_file" pull
-        docker-compose -f "$compose_file" up -d --remove-orphans
+        docker compose -f "$compose_file" pull
+        docker compose -f "$compose_file" up -d --remove-orphans
     else
         echo "> Skipping $compose_file as it's not running."
     fi
diff --git a/ansible/roles/docker_cleanup/tasks/main.yml b/ansible/roles/docker_cleanup/tasks/main.yml
index f2e5e13..bec1497 100644
--- a/ansible/roles/docker_cleanup/tasks/main.yml
+++ b/ansible/roles/docker_cleanup/tasks/main.yml
@@ -3,13 +3,6 @@
     name: docker-compose
   when: ansible_os_family != 'Debian'
 
-- name: Install compose-switch
-  get_url:
-    url: "{{ docker_compose_url }}"
-    dest: "{{ docker_compose_path }}"
-    mode: "0755"
-  when: ansible_os_family == 'Debian'
-
 - name: Create docker group
   group:
     name: "{{ docker_user.name }}"
diff --git a/ansible/roles/forgejo/tasks/main.yml b/ansible/roles/forgejo/tasks/main.yml
index 1d00db6..ed9d63a 100644
--- a/ansible/roles/forgejo/tasks/main.yml
+++ b/ansible/roles/forgejo/tasks/main.yml
@@ -14,7 +14,7 @@
     dest: /opt/gitea/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart gitea
 
 - name: Install config file
diff --git a/ansible/roles/forgejo_runner/tasks/main.yml b/ansible/roles/forgejo_runner/tasks/main.yml
index 013acd6..1463212 100644
--- a/ansible/roles/forgejo_runner/tasks/main.yml
+++ b/ansible/roles/forgejo_runner/tasks/main.yml
@@ -19,5 +19,5 @@
     dest: /opt/forgejo-runner/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart forgejo-runner
diff --git a/ansible/roles/freshrss/tasks/main.yml b/ansible/roles/freshrss/tasks/main.yml
index 92b5f95..0acb69f 100644
--- a/ansible/roles/freshrss/tasks/main.yml
+++ b/ansible/roles/freshrss/tasks/main.yml
@@ -22,7 +22,7 @@
     dest: /opt/freshrss/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart freshrss
 
 - name: Install three panes extension
diff --git a/ansible/roles/immich/tasks/main.yml b/ansible/roles/immich/tasks/main.yml
index b0eb94e..a26a905 100644
--- a/ansible/roles/immich/tasks/main.yml
+++ b/ansible/roles/immich/tasks/main.yml
@@ -11,7 +11,7 @@
     dest: /opt/immich/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart immich
 
 - name: Install IPP config
diff --git a/ansible/roles/karakeep/tasks/main.yml b/ansible/roles/karakeep/tasks/main.yml
index 5702d52..78fa5c2 100644
--- a/ansible/roles/karakeep/tasks/main.yml
+++ b/ansible/roles/karakeep/tasks/main.yml
@@ -14,5 +14,5 @@
     dest: /opt/karakeep/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart karakeep
diff --git a/ansible/roles/macau/tasks/main.yml b/ansible/roles/macau/tasks/main.yml
index 99d9122..90c4223 100644
--- a/ansible/roles/macau/tasks/main.yml
+++ b/ansible/roles/macau/tasks/main.yml
@@ -14,5 +14,5 @@
     dest: /opt/macau/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart macau
diff --git a/ansible/roles/mastodon/files/purge-media.sh b/ansible/roles/mastodon/files/purge-media.sh
index 14ce246..6681f81 100644
--- a/ansible/roles/mastodon/files/purge-media.sh
+++ b/ansible/roles/mastodon/files/purge-media.sh
@@ -6,9 +6,9 @@ set -ex
 
 cd /opt/mastodon
 
-docker-compose exec mastodon tootctl accounts prune
-docker-compose exec mastodon tootctl media remove
-docker-compose exec mastodon tootctl media remove --prune-profiles
-docker-compose exec mastodon tootctl preview_cards remove --days=21
-docker-compose exec mastodon tootctl media remove-orphans
-docker-compose exec mastodon tootctl statuses remove --days=180
+docker compose exec mastodon tootctl accounts prune
+docker compose exec mastodon tootctl media remove
+docker compose exec mastodon tootctl media remove --prune-profiles
+docker compose exec mastodon tootctl preview_cards remove --days=21
+docker compose exec mastodon tootctl media remove-orphans
+docker compose exec mastodon tootctl statuses remove --days=180
diff --git a/ansible/roles/mastodon/tasks/main.yml b/ansible/roles/mastodon/tasks/main.yml
index cf75a15..5a8047e 100644
--- a/ansible/roles/mastodon/tasks/main.yml
+++ b/ansible/roles/mastodon/tasks/main.yml
@@ -14,7 +14,7 @@
     dest: /opt/mastodon/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart mastodon
 
 - name: Install media cleanup script
diff --git a/ansible/roles/ntfy/tasks/main.yml b/ansible/roles/ntfy/tasks/main.yml
index 6399446..7aa1b55 100644
--- a/ansible/roles/ntfy/tasks/main.yml
+++ b/ansible/roles/ntfy/tasks/main.yml
@@ -14,5 +14,5 @@
     dest: /opt/ntfy/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart ntfy
diff --git a/ansible/roles/plausible/tasks/main.yml b/ansible/roles/plausible/tasks/main.yml
index dfce771..05f983f 100644
--- a/ansible/roles/plausible/tasks/main.yml
+++ b/ansible/roles/plausible/tasks/main.yml
@@ -28,5 +28,5 @@
     dest: /opt/plausible/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart plausible
diff --git a/ansible/roles/pocket_id/tasks/main.yml b/ansible/roles/pocket_id/tasks/main.yml
index 3526556..3350c4b 100644
--- a/ansible/roles/pocket_id/tasks/main.yml
+++ b/ansible/roles/pocket_id/tasks/main.yml
@@ -14,5 +14,5 @@
     dest: /opt/pocket-id/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart pocket-id
diff --git a/ansible/roles/privatebin/tasks/main.yml b/ansible/roles/privatebin/tasks/main.yml
index b7f2f78..7c82d23 100644
--- a/ansible/roles/privatebin/tasks/main.yml
+++ b/ansible/roles/privatebin/tasks/main.yml
@@ -11,7 +11,7 @@
     dest: /opt/privatebin/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart privatebin
 
 - name: Install config file
diff --git a/ansible/roles/prometheus/handlers/main.yml b/ansible/roles/prometheus/handlers/main.yml
index 2fc99ed..3b03b37 100644
--- a/ansible/roles/prometheus/handlers/main.yml
+++ b/ansible/roles/prometheus/handlers/main.yml
@@ -11,4 +11,4 @@
 - name: reload prometheus
   shell:
     chdir: /opt/prometheus
-    cmd: docker-compose exec prometheus kill -HUP 1
+    cmd: docker compose exec prometheus kill -HUP 1
diff --git a/ansible/roles/prometheus/tasks/grafana.yml b/ansible/roles/prometheus/tasks/grafana.yml
index ae40d59..dae3d49 100644
--- a/ansible/roles/prometheus/tasks/grafana.yml
+++ b/ansible/roles/prometheus/tasks/grafana.yml
@@ -15,5 +15,5 @@
     dest: /opt/grafana/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart grafana
diff --git a/ansible/roles/prometheus/tasks/prometheus.yml b/ansible/roles/prometheus/tasks/prometheus.yml
index 05e6685..d80467e 100644
--- a/ansible/roles/prometheus/tasks/prometheus.yml
+++ b/ansible/roles/prometheus/tasks/prometheus.yml
@@ -19,7 +19,7 @@
     dest: /opt/prometheus/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart prometheus
 
 - name: Install blackbox config
diff --git a/ansible/roles/pve_docker/files/nextcloud/occ b/ansible/roles/pve_docker/files/nextcloud/occ
index 43494a7..d2f1602 100755
--- a/ansible/roles/pve_docker/files/nextcloud/occ
+++ b/ansible/roles/pve_docker/files/nextcloud/occ
@@ -2,4 +2,4 @@
 
 set -e
 
-exec docker-compose -f /opt/nextcloud/docker-compose.yml exec nextcloud occ "$@"
+exec docker compose -f /opt/nextcloud/docker-compose.yml exec nextcloud occ "$@"
diff --git a/ansible/roles/pve_docker/tasks/calibre.yml b/ansible/roles/pve_docker/tasks/calibre.yml
index 3743c7b..94c45e4 100644
--- a/ansible/roles/pve_docker/tasks/calibre.yml
+++ b/ansible/roles/pve_docker/tasks/calibre.yml
@@ -11,7 +11,7 @@
     dest: /opt/calibre/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   register: compose_file
 
 - name: restart calibre
diff --git a/ansible/roles/pve_docker/tasks/librespeed.yml b/ansible/roles/pve_docker/tasks/librespeed.yml
index 2acebb2..dff49c4 100644
--- a/ansible/roles/pve_docker/tasks/librespeed.yml
+++ b/ansible/roles/pve_docker/tasks/librespeed.yml
@@ -14,7 +14,7 @@
     dest: /opt/librespeed/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   register: compose_file
 
 - name: restart librespeed
diff --git a/ansible/roles/pve_docker/tasks/nextcloud.yml b/ansible/roles/pve_docker/tasks/nextcloud.yml
index 66f8e61..9044aa1 100644
--- a/ansible/roles/pve_docker/tasks/nextcloud.yml
+++ b/ansible/roles/pve_docker/tasks/nextcloud.yml
@@ -14,7 +14,7 @@
     dest: /opt/nextcloud/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   register: compose_file
 
 - name: Install nextcloud config
diff --git a/ansible/roles/pve_docker/tasks/synapse.yml b/ansible/roles/pve_docker/tasks/synapse.yml
index 3df6b96..da7ede2 100644
--- a/ansible/roles/pve_docker/tasks/synapse.yml
+++ b/ansible/roles/pve_docker/tasks/synapse.yml
@@ -14,7 +14,7 @@
     dest: /opt/synapse/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   register: compose_file
 
 - name: Install synapse config
diff --git a/ansible/roles/pve_docker/tasks/whoami.yml b/ansible/roles/pve_docker/tasks/whoami.yml
index fa2c4bd..67ceb98 100644
--- a/ansible/roles/pve_docker/tasks/whoami.yml
+++ b/ansible/roles/pve_docker/tasks/whoami.yml
@@ -11,7 +11,7 @@
     dest: /opt/whoami/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   register: compose_file
 
 - name: restart whoami
diff --git a/ansible/roles/renovate/tasks/main.yml b/ansible/roles/renovate/tasks/main.yml
index 4d77b71..48ca6ea 100644
--- a/ansible/roles/renovate/tasks/main.yml
+++ b/ansible/roles/renovate/tasks/main.yml
@@ -14,7 +14,7 @@
     dest: /opt/renovate/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart renovate
 
 - name: Install config file
diff --git a/ansible/roles/slides/tasks/main.yml b/ansible/roles/slides/tasks/main.yml
index ab1452a..db154ef 100644
--- a/ansible/roles/slides/tasks/main.yml
+++ b/ansible/roles/slides/tasks/main.yml
@@ -14,7 +14,7 @@
     dest: /opt/slides/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart slides
 
 - name: Create credentials
diff --git a/ansible/roles/tandoor/tasks/main.yml b/ansible/roles/tandoor/tasks/main.yml
index 6e0bb16..a5e9b1a 100644
--- a/ansible/roles/tandoor/tasks/main.yml
+++ b/ansible/roles/tandoor/tasks/main.yml
@@ -14,5 +14,5 @@
     dest: /opt/tandoor/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart tandoor
diff --git a/ansible/roles/traefik/tasks/main.yml b/ansible/roles/traefik/tasks/main.yml
index 32adec0..e2680c7 100644
--- a/ansible/roles/traefik/tasks/main.yml
+++ b/ansible/roles/traefik/tasks/main.yml
@@ -33,7 +33,7 @@
     dest: /opt/traefik/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart traefik
 
 - name: Install config
diff --git a/ansible/roles/uptime_kuma/tasks/main.yml b/ansible/roles/uptime_kuma/tasks/main.yml
index 1ef17f0..6dc6535 100644
--- a/ansible/roles/uptime_kuma/tasks/main.yml
+++ b/ansible/roles/uptime_kuma/tasks/main.yml
@@ -11,5 +11,5 @@
     dest: /opt/uptime-kuma/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart uptime-kuma
diff --git a/ansible/roles/vaultwarden/tasks/main.yml b/ansible/roles/vaultwarden/tasks/main.yml
index b1829e9..a3db227 100644
--- a/ansible/roles/vaultwarden/tasks/main.yml
+++ b/ansible/roles/vaultwarden/tasks/main.yml
@@ -11,5 +11,5 @@
     dest: /opt/vaultwarden/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart vaultwarden
diff --git a/ansible/roles/vikunja/tasks/main.yml b/ansible/roles/vikunja/tasks/main.yml
index bf77301..781d0ed 100644
--- a/ansible/roles/vikunja/tasks/main.yml
+++ b/ansible/roles/vikunja/tasks/main.yml
@@ -14,5 +14,5 @@
     dest: /opt/vikunja/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart vikunja
diff --git a/ansible/roles/website/tasks/main.yml b/ansible/roles/website/tasks/main.yml
index 63e7e22..5498acd 100644
--- a/ansible/roles/website/tasks/main.yml
+++ b/ansible/roles/website/tasks/main.yml
@@ -14,5 +14,5 @@
     dest: /opt/website/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
-    validate: docker-compose -f %s config
+    validate: docker compose -f %s config
   notify: restart website