diff --git a/roles/camo/tasks/main.yml b/roles/camo/tasks/main.yml
index 5b723ad..5d7170e 100644
--- a/roles/camo/tasks/main.yml
+++ b/roles/camo/tasks/main.yml
@@ -37,7 +37,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - camo
diff --git a/roles/codimd/tasks/main.yml b/roles/codimd/tasks/main.yml
index 3049f46..3f26012 100644
--- a/roles/codimd/tasks/main.yml
+++ b/roles/codimd/tasks/main.yml
@@ -73,7 +73,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - codimd
diff --git a/roles/docker_ipv6_nat/tasks/main.yml b/roles/docker_ipv6_nat/tasks/main.yml
index ce870c7..3088d88 100644
--- a/roles/docker_ipv6_nat/tasks/main.yml
+++ b/roles/docker_ipv6_nat/tasks/main.yml
@@ -37,7 +37,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - docker-ipv6-nat
diff --git a/roles/factorio/tasks/main.yml b/roles/factorio/tasks/main.yml
index 4a8be43..8007773 100644
--- a/roles/factorio/tasks/main.yml
+++ b/roles/factorio/tasks/main.yml
@@ -62,7 +62,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - factorio
diff --git a/roles/gitlab/tasks/main.yml b/roles/gitlab/tasks/main.yml
index 624eb76..457ae4e 100644
--- a/roles/gitlab/tasks/main.yml
+++ b/roles/gitlab/tasks/main.yml
@@ -66,7 +66,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - gitlab
diff --git a/roles/gitlab_runner/tasks/main.yml b/roles/gitlab_runner/tasks/main.yml
index 2207e12..fd32cfc 100644
--- a/roles/gitlab_runner/tasks/main.yml
+++ b/roles/gitlab_runner/tasks/main.yml
@@ -59,7 +59,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
   become: true
diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml
index 1da7305..18e204b 100644
--- a/roles/keycloak/tasks/main.yml
+++ b/roles/keycloak/tasks/main.yml
@@ -61,7 +61,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - keycloak
diff --git a/roles/mastodon/tasks/main.yml b/roles/mastodon/tasks/main.yml
index a33250a..070ea68 100644
--- a/roles/mastodon/tasks/main.yml
+++ b/roles/mastodon/tasks/main.yml
@@ -124,7 +124,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - mastodon
   become: true
diff --git a/roles/matrix/tasks/main.yml b/roles/matrix/tasks/main.yml
index baa9e59..5773870 100644
--- a/roles/matrix/tasks/main.yml
+++ b/roles/matrix/tasks/main.yml
@@ -60,7 +60,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - matrix
   become: true
@@ -118,7 +118,7 @@
   become: true
 
 - name: Generate synapse config
-  command: 'python2 -m compose run -e "SYNAPSE_SERVER_NAME={{ matrix_synapse_servername }}" synapse generate'
+  command: 'docker-compose run -e "SYNAPSE_SERVER_NAME={{ matrix_synapse_servername }}" synapse generate'
   args:
     chdir: "{{ matrix_install_location }}"
     creates: "{{ matrix_data_location }}/homeserver.yaml"
diff --git a/roles/minecraft/tasks/main.yml b/roles/minecraft/tasks/main.yml
index b8d7485..23e5d84 100644
--- a/roles/minecraft/tasks/main.yml
+++ b/roles/minecraft/tasks/main.yml
@@ -62,7 +62,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - minecraft
diff --git a/roles/minecraft_blockmap/tasks/main.yml b/roles/minecraft_blockmap/tasks/main.yml
index 90452f6..677daa2 100644
--- a/roles/minecraft_blockmap/tasks/main.yml
+++ b/roles/minecraft_blockmap/tasks/main.yml
@@ -94,7 +94,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - blockmap
diff --git a/roles/minio/tasks/main.yml b/roles/minio/tasks/main.yml
index 96d3a79..93edb05 100644
--- a/roles/minio/tasks/main.yml
+++ b/roles/minio/tasks/main.yml
@@ -77,7 +77,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - minio
diff --git a/roles/monitoring/tasks/main.yml b/roles/monitoring/tasks/main.yml
index 5954817..424421e 100644
--- a/roles/monitoring/tasks/main.yml
+++ b/roles/monitoring/tasks/main.yml
@@ -69,7 +69,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   become: true
 
 - name: Compose monitoring
diff --git a/roles/owncast/tasks/main.yml b/roles/owncast/tasks/main.yml
index a6a2005..ecfb864 100644
--- a/roles/owncast/tasks/main.yml
+++ b/roles/owncast/tasks/main.yml
@@ -71,7 +71,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - owncast
diff --git a/roles/static_websites/tasks/main.yml b/roles/static_websites/tasks/main.yml
index d6c5b79..bbd34d8 100644
--- a/roles/static_websites/tasks/main.yml
+++ b/roles/static_websites/tasks/main.yml
@@ -37,7 +37,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   when:
     - static_websites | length > 0
   tags:
diff --git a/roles/teamspeak/tasks/main.yml b/roles/teamspeak/tasks/main.yml
index 6968122..14c82ea 100644
--- a/roles/teamspeak/tasks/main.yml
+++ b/roles/teamspeak/tasks/main.yml
@@ -59,7 +59,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - teamspeak
diff --git a/roles/telegraf/tasks/main.yml b/roles/telegraf/tasks/main.yml
index d6eca92..7de0ab6 100644
--- a/roles/telegraf/tasks/main.yml
+++ b/roles/telegraf/tasks/main.yml
@@ -56,7 +56,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   become: true
 
 - name: Deploy telegraf config
diff --git a/roles/traefik/tasks/main.yml b/roles/traefik/tasks/main.yml
index 882eceb..d1327a3 100644
--- a/roles/traefik/tasks/main.yml
+++ b/roles/traefik/tasks/main.yml
@@ -120,7 +120,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
   become: true
diff --git a/roles/ts3audiobot/tasks/main.yml b/roles/ts3audiobot/tasks/main.yml
index 6ef16a0..c429073 100644
--- a/roles/ts3audiobot/tasks/main.yml
+++ b/roles/ts3audiobot/tasks/main.yml
@@ -62,7 +62,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
     - ts3audiobot
diff --git a/roles/unicorns_website/tasks/main.yml b/roles/unicorns_website/tasks/main.yml
index 114be59..4ce374b 100644
--- a/roles/unicorns_website/tasks/main.yml
+++ b/roles/unicorns_website/tasks/main.yml
@@ -61,7 +61,7 @@
     mode: '0600'
     owner: 'root'
     group: 'root'
-    validate: python2 -m compose -f %s config -q
+    validate: docker-compose -f %s config -q
   tags:
     - docker
   become: true