From bbeb302eaefe16323910315735cffe5ab35b32fb Mon Sep 17 00:00:00 2001
From: Steven Yuen <steven.yuen@datadoghq.com>
Date: Wed, 26 Jun 2024 09:07:52 -0400
Subject: [PATCH] Sy/remove outdated compose version (#17928)

* remove obsolte version

* new lines removal

* new lines removal

* clean up

* missing files
---
 activemq/tests/compose/activemq.yaml                           | 3 ---
 activemq/tests/compose/artemis.yaml                            | 2 --
 activemq_xml/tests/compose/docker-compose.yaml                 | 2 --
 airflow/tests/compose/docker-compose.yaml                      | 2 --
 amazon_msk/tests/docker/docker-compose.yaml                    | 2 --
 apache/tests/compose/apache.yaml                               | 2 --
 avi_vantage/tests/compose/docker-compose.yaml                  | 2 --
 azure_iot_edge/tests/compose/docker-compose-tls.yaml           | 2 --
 azure_iot_edge/tests/compose/docker-compose.yaml               | 2 --
 azure_iot_edge/tests/compose/mock_server/docker-compose.yaml   | 2 --
 cacti/tests/compose/docker-compose.yaml                        | 2 --
 cassandra/tests/compose/docker-compose.yml                     | 2 --
 cassandra_nodetool/tests/compose/docker-compose.yaml           | 2 --
 ceph/tests/compose/docker-compose.yaml                         | 2 --
 citrix_hypervisor/tests/compose/docker-compose.yaml            | 2 --
 cloudera/tests/docker/docker-compose.yaml                      | 2 --
 confluent_platform/tests/compose/docker-compose.yaml           | 1 -
 consul/tests/compose/compose.yaml                              | 2 --
 couch/tests/compose/compose_v1.yaml                            | 2 --
 couch/tests/compose/compose_v2.yaml                            | 3 ---
 couchbase/tests/compose/docker-compose.yaml                    | 2 --
 datadog_checks_base/tests/compose/kerberos/kerberos-agent.yaml | 2 --
 datadog_checks_base/tests/compose/kerberos/kerberos.yaml       | 2 --
 datadog_checks_base/tests/compose/socks5-proxy.yaml            | 2 --
 datadog_checks_base/tests/compose/uds/uds.yaml                 | 2 --
 dcgm/tests/docker/docker-compose.yaml                          | 2 --
 druid/tests/compose/docker-compose.yaml                        | 2 --
 elastic/tests/compose/elasticsearch-docker-compose.yaml        | 2 --
 elastic/tests/compose/opensearch-docker-compose.yaml           | 2 --
 esxi/tests/docker/docker-compose.yaml                          | 2 --
 gearmand/tests/compose/docker-compose.yaml                     | 1 -
 gitlab/tests/compose/docker-compose.yml                        | 1 -
 gitlab_runner/tests/compose/docker-compose.yml                 | 1 -
 go_expvar/tests/compose/docker-compose.yaml                    | 2 --
 gunicorn/tests/compose/docker-compose.yaml                     | 2 --
 haproxy/tests/compose/haproxy.yaml                             | 2 --
 harbor/tests/compose/harbor-1.10.0/docker-compose.yml          | 1 -
 harbor/tests/compose/harbor-2.0.5/docker-compose.yml           | 1 -
 harbor/tests/compose/harbor-2.3.2/docker-compose.yml           | 1 -
 hazelcast/tests/docker/docker-compose.yaml                     | 2 --
 hdfs_datanode/tests/compose/docker-compose.yaml                | 2 +-
 hdfs_namenode/tests/compose/docker-compose.yaml                | 1 -
 hive/tests/compose/docker-compose.yaml                         | 2 --
 hivemq/tests/docker/docker-compose.yaml                        | 2 --
 http_check/tests/compose/docker-compose.yml                    | 2 --
 ibm_mq/tests/compose/docker-compose-v9.yml                     | 2 --
 ibm_mq/tests/compose/docker-compose-v9cluster.yml              | 2 --
 ignite/tests/compose/docker-compose.yml                        | 1 -
 impala/tests/compose/docker-compose.yaml                       | 2 --
 impala/tests/load_tests/docker-compose.yaml                    | 2 --
 kafka/tests/compose/docker-compose.yml                         | 2 --
 karpenter/tests/docker/docker-compose.yaml                     | 2 --
 kong/tests/compose/docker-compose.yml                          | 2 --
 kubernetes_cluster_autoscaler/tests/docker/docker-compose.yaml | 2 --
 kyototycoon/tests/compose/compose_kyototycoon.yaml             | 2 --
 linkerd/tests/compose/docker-compose.yaml                      | 2 --
 mapreduce/tests/compose/docker-compose.yaml                    | 2 --
 marathon/tests/compose/docker-compose.yml                      | 1 -
 marklogic/tests/compose/cluster/docker-compose.yml             | 2 --
 marklogic/tests/compose/standalone/docker-compose.yml          | 2 --
 mcache/tests/compose/docker-compose.yaml                       | 2 --
 mesos_master/tests/compose/docker-compose.yml                  | 1 -
 mesos_slave/tests/compose/docker-compose.yml                   | 2 +-
 mongo/tests/compose/mongo-auth.yaml                            | 2 --
 mongo/tests/compose/mongo-shard.yaml                           | 2 --
 mongo/tests/compose/mongo-standalone.yaml                      | 2 --
 mongo/tests/compose/mongo-tls.yaml                             | 2 --
 mysql/tests/compose/mariadb.yaml                               | 2 --
 mysql/tests/compose/mysql.yaml                                 | 2 --
 mysql/tests/compose/mysql8-group.yaml                          | 2 --
 mysql/tests/compose/mysql8.yaml                                | 2 --
 nagios/tests/compose/docker-compose.yaml                       | 1 -
 nfsstat/tests/compose/compose.yaml                             | 2 --
 nvidia_triton/tests/docker/docker-compose.yaml                 | 2 --
 openldap/tests/compose/docker-compose.yaml                     | 2 --
 openmetrics/tests/compose/docker-compose.yaml                  | 2 --
 openstack_controller/tests/legacy/docker/docker-compose.yaml   | 2 --
 pgbouncer/tests/compose/docker-compose-old.yml                 | 2 --
 pgbouncer/tests/compose/docker-compose.yml                     | 2 --
 php_fpm/tests/compose/docker-compose.yml                       | 2 --
 postgres/tests/compose/docker-compose-replication.yaml         | 2 --
 postgres/tests/compose/docker-compose.yaml                     | 2 --
 powerdns_recursor/tests/compose/powerdns.yaml                  | 2 --
 proxysql/tests/compose/docker-compose.yml                      | 2 --
 rabbitmq/tests/compose/docker-compose.yaml                     | 1 -
 redisdb/tests/compose/1m-2s-cloud.compose                      | 2 --
 redisdb/tests/compose/1m-2s.compose                            | 2 --
 redisdb/tests/compose/standalone.compose                       | 2 --
 rethinkdb/tests/compose/docker-compose.yaml                    | 2 --
 riak/tests/compose/riak.yaml                                   | 2 --
 riakcs/tests/compose/docker-compose.yaml                       | 2 --
 scylla/tests/compose/docker-compose.yaml                       | 2 --
 silk/tests/docker/docker-compose.yaml                          | 2 --
 singlestore/tests/compose/docker-compose.yaml                  | 2 --
 snmp/tests/compose/docker-compose.yaml                         | 2 --
 sqlserver/tests/compose/docker-compose.yaml                    | 2 --
 squid/tests/compose/squid.yaml                                 | 2 --
 ssh_check/tests/compose/docker-compose-keypair.yml             | 2 --
 ssh_check/tests/compose/docker-compose.yml                     | 2 --
 statsd/tests/compose/statsd.yaml                               | 2 --
 supervisord/tests/compose/supervisord.yaml                     | 2 --
 teamcity/tests/docker/mockserver/docker-compose.yaml           | 2 --
 temporal/tests/compose/docker-compose.yaml                     | 1 -
 tls/tests/compose/docker-compose.yml                           | 2 --
 tokumx/tests/compose/docker-compose.yaml                       | 2 --
 tomcat/tests/compose/embedded/docker-compose.yml               | 2 --
 tomcat/tests/compose/standalone/docker-compose.yml             | 2 --
 traffic_server/tests/compose/docker-compose.yaml               | 2 --
 twemproxy/tests/compose/docker-compose.yaml                    | 1 -
 varnish/tests/compose/docker-compose-4-5.yaml                  | 1 -
 varnish/tests/compose/docker-compose.yaml                      | 1 -
 vertica/tests/docker/docker-compose.yaml                       | 2 --
 voltdb/tests/compose/docker-compose.yaml                       | 2 --
 weblogic/tests/compose/docker-compose.yml                      | 2 --
 yarn/tests/compose/docker-compose.yaml                         | 2 --
 zk/tests/compose/zk.yaml                                       | 2 --
 zk/tests/compose/zk35.yaml                                     | 2 --
 zk/tests/compose/zk35_ssl.yaml                                 | 2 --
 zk/tests/compose/zk36plus.yaml                                 | 2 --
 zk/tests/compose/zk36plus_ssl.yaml                             | 2 --
 120 files changed, 2 insertions(+), 223 deletions(-)

diff --git a/activemq/tests/compose/activemq.yaml b/activemq/tests/compose/activemq.yaml
index 7bcb005c8d21b..504e436736c5e 100644
--- a/activemq/tests/compose/activemq.yaml
+++ b/activemq/tests/compose/activemq.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   namenode:
     image: rmohr/activemq:${VERSION}
@@ -14,4 +12,3 @@ services:
     ports:
       - "8161:8161"
       - "${JMX_PORT}:${JMX_PORT}"
-
diff --git a/activemq/tests/compose/artemis.yaml b/activemq/tests/compose/artemis.yaml
index 801da12963812..aba6a1101897b 100644
--- a/activemq/tests/compose/artemis.yaml
+++ b/activemq/tests/compose/artemis.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   namenode:
     image: vromero/activemq-artemis:${VERSION}
diff --git a/activemq_xml/tests/compose/docker-compose.yaml b/activemq_xml/tests/compose/docker-compose.yaml
index 6bf442acb4698..a5cc96607b218 100644
--- a/activemq_xml/tests/compose/docker-compose.yaml
+++ b/activemq_xml/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   activemq_xml:
     image: rmohr/activemq:${ACTIVEMQ_XML_VERSION}
diff --git a/airflow/tests/compose/docker-compose.yaml b/airflow/tests/compose/docker-compose.yaml
index 664ed70e0e3be..fb6f8b91b2b0b 100644
--- a/airflow/tests/compose/docker-compose.yaml
+++ b/airflow/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   postgres:
     image: postgres:12-alpine
diff --git a/amazon_msk/tests/docker/docker-compose.yaml b/amazon_msk/tests/docker/docker-compose.yaml
index 44477797248cd..7d02d5dc74d61 100644
--- a/amazon_msk/tests/docker/docker-compose.yaml
+++ b/amazon_msk/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mock-msk-endpoint-jmx:
     image: caddy:2.1.1-alpine
diff --git a/apache/tests/compose/apache.yaml b/apache/tests/compose/apache.yaml
index 2b12f0e018d41..41bb232e5c846 100644
--- a/apache/tests/compose/apache.yaml
+++ b/apache/tests/compose/apache.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   apache:
     image: "httpd:${APACHE_VERSION}"
diff --git a/avi_vantage/tests/compose/docker-compose.yaml b/avi_vantage/tests/compose/docker-compose.yaml
index f6248313eff58..04282e618ed98 100644
--- a/avi_vantage/tests/compose/docker-compose.yaml
+++ b/avi_vantage/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   avi:
     build: .
diff --git a/azure_iot_edge/tests/compose/docker-compose-tls.yaml b/azure_iot_edge/tests/compose/docker-compose-tls.yaml
index 2972578688c95..7c079ffd4de43 100644
--- a/azure_iot_edge/tests/compose/docker-compose-tls.yaml
+++ b/azure_iot_edge/tests/compose/docker-compose-tls.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   iot-edge-device:
     build:
diff --git a/azure_iot_edge/tests/compose/docker-compose.yaml b/azure_iot_edge/tests/compose/docker-compose.yaml
index 647c95bc9b33d..ae68c5fda4528 100644
--- a/azure_iot_edge/tests/compose/docker-compose.yaml
+++ b/azure_iot_edge/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   iot-edge-device:
     build:
diff --git a/azure_iot_edge/tests/compose/mock_server/docker-compose.yaml b/azure_iot_edge/tests/compose/mock_server/docker-compose.yaml
index 32c53ee22c9ac..3b0f9e28656e7 100644
--- a/azure_iot_edge/tests/compose/mock_server/docker-compose.yaml
+++ b/azure_iot_edge/tests/compose/mock_server/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   iot-edge-mock:
     image: caddy:2.1.1-alpine
diff --git a/cacti/tests/compose/docker-compose.yaml b/cacti/tests/compose/docker-compose.yaml
index f66e98ee404e4..55eea997fb361 100644
--- a/cacti/tests/compose/docker-compose.yaml
+++ b/cacti/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   cacti:
     container_name: cacti
diff --git a/cassandra/tests/compose/docker-compose.yml b/cassandra/tests/compose/docker-compose.yml
index b47d5be143f86..ded06cc0130a6 100644
--- a/cassandra/tests/compose/docker-compose.yml
+++ b/cassandra/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   cassandra:
     build:
diff --git a/cassandra_nodetool/tests/compose/docker-compose.yaml b/cassandra_nodetool/tests/compose/docker-compose.yaml
index 8144fc7d2da8f..afc3786c4dc09 100644
--- a/cassandra_nodetool/tests/compose/docker-compose.yaml
+++ b/cassandra_nodetool/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   dd-test-cassandra:
     build:
diff --git a/ceph/tests/compose/docker-compose.yaml b/ceph/tests/compose/docker-compose.yaml
index b98bf93d5ad9a..a3dc989e26078 100644
--- a/ceph/tests/compose/docker-compose.yaml
+++ b/ceph/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   dd-test-ceph:
     image: ceph/daemon:${CEPH_VERSION}
diff --git a/citrix_hypervisor/tests/compose/docker-compose.yaml b/citrix_hypervisor/tests/compose/docker-compose.yaml
index 548d2885adbbf..603b93b602227 100644
--- a/citrix_hypervisor/tests/compose/docker-compose.yaml
+++ b/citrix_hypervisor/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mock-standalone:
     build: .
diff --git a/cloudera/tests/docker/docker-compose.yaml b/cloudera/tests/docker/docker-compose.yaml
index b0b2b773872a2..83baff8ba1e16 100644
--- a/cloudera/tests/docker/docker-compose.yaml
+++ b/cloudera/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   cloudera:
     image: caddy:2.6.2-alpine
diff --git a/confluent_platform/tests/compose/docker-compose.yaml b/confluent_platform/tests/compose/docker-compose.yaml
index fe68a2ed09bb9..c5ad8feb9d754 100644
--- a/confluent_platform/tests/compose/docker-compose.yaml
+++ b/confluent_platform/tests/compose/docker-compose.yaml
@@ -1,6 +1,5 @@
 ---
 # Inspired by https://github.com/confluentinc/cp-all-in-one/blob/6.2.1-post/cp-all-in-one/docker-compose.yml
-version: '2'
 services:
   zookeeper:
     image: confluentinc/cp-zookeeper:${CONFLUENT_VERSION}
diff --git a/consul/tests/compose/compose.yaml b/consul/tests/compose/compose.yaml
index 8e4dea15f2528..288ee5ce6bb3b 100644
--- a/consul/tests/compose/compose.yaml
+++ b/consul/tests/compose/compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   consul-leader:
     image: "consul:${CONSUL_VERSION}"
diff --git a/couch/tests/compose/compose_v1.yaml b/couch/tests/compose/compose_v1.yaml
index 56d584e2f5a37..8a44617c39fc3 100644
--- a/couch/tests/compose/compose_v1.yaml
+++ b/couch/tests/compose/compose_v1.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   couch:
     container_name: couchdb-1
diff --git a/couch/tests/compose/compose_v2.yaml b/couch/tests/compose/compose_v2.yaml
index 4226739562fa6..d8368e7b631e2 100644
--- a/couch/tests/compose/compose_v2.yaml
+++ b/couch/tests/compose/compose_v2.yaml
@@ -1,8 +1,5 @@
-version: "3.5"
-
 networks:
   network:
-
 services:
   couchdb-1:
     container_name: couchdb-1
diff --git a/couchbase/tests/compose/docker-compose.yaml b/couchbase/tests/compose/docker-compose.yaml
index 972006259d62c..71b782a715ca1 100644
--- a/couchbase/tests/compose/docker-compose.yaml
+++ b/couchbase/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   couchbase-standalone:
     image: "couchbase/server:${COUCHBASE_VERSION}"
diff --git a/datadog_checks_base/tests/compose/kerberos/kerberos-agent.yaml b/datadog_checks_base/tests/compose/kerberos/kerberos-agent.yaml
index c59bab82c84a6..f2a1403776b02 100644
--- a/datadog_checks_base/tests/compose/kerberos/kerberos-agent.yaml
+++ b/datadog_checks_base/tests/compose/kerberos/kerberos-agent.yaml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
 
   agent:
diff --git a/datadog_checks_base/tests/compose/kerberos/kerberos.yaml b/datadog_checks_base/tests/compose/kerberos/kerberos.yaml
index 935c488ddddd3..e6a1d567e53ad 100644
--- a/datadog_checks_base/tests/compose/kerberos/kerberos.yaml
+++ b/datadog_checks_base/tests/compose/kerberos/kerberos.yaml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   kerberos-kdc:
     build: ./kerberos-kdc
diff --git a/datadog_checks_base/tests/compose/socks5-proxy.yaml b/datadog_checks_base/tests/compose/socks5-proxy.yaml
index a774e38d3e3f5..b3fc5cb0a4f42 100644
--- a/datadog_checks_base/tests/compose/socks5-proxy.yaml
+++ b/datadog_checks_base/tests/compose/socks5-proxy.yaml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   socks5:
     image: "serjs/go-socks5-proxy:latest"
diff --git a/datadog_checks_base/tests/compose/uds/uds.yaml b/datadog_checks_base/tests/compose/uds/uds.yaml
index fc66bde665729..d1bd18c7b57eb 100644
--- a/datadog_checks_base/tests/compose/uds/uds.yaml
+++ b/datadog_checks_base/tests/compose/uds/uds.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   uds-server:
     image: nginx:1.19-alpine
diff --git a/dcgm/tests/docker/docker-compose.yaml b/dcgm/tests/docker/docker-compose.yaml
index 8a1be54a3188b..a0531fb3e37d1 100755
--- a/dcgm/tests/docker/docker-compose.yaml
+++ b/dcgm/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
 
 # Caddy will create host a site with the metrics to exposes
diff --git a/druid/tests/compose/docker-compose.yaml b/druid/tests/compose/docker-compose.yaml
index 877031489a3e2..5a430a47c4b43 100644
--- a/druid/tests/compose/docker-compose.yaml
+++ b/druid/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
 
   zookeeper:
diff --git a/elastic/tests/compose/elasticsearch-docker-compose.yaml b/elastic/tests/compose/elasticsearch-docker-compose.yaml
index 9dfeaad10e9f8..f3ac9242469c2 100644
--- a/elastic/tests/compose/elasticsearch-docker-compose.yaml
+++ b/elastic/tests/compose/elasticsearch-docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   elastic:
     image: "${ELASTIC_REGISTRY}:${ELASTIC_IMAGE}"
diff --git a/elastic/tests/compose/opensearch-docker-compose.yaml b/elastic/tests/compose/opensearch-docker-compose.yaml
index 7ef0575d3d99c..9da2c19b7cba4 100644
--- a/elastic/tests/compose/opensearch-docker-compose.yaml
+++ b/elastic/tests/compose/opensearch-docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   elastic:
     image: "${ELASTIC_REGISTRY}:${ELASTIC_IMAGE}"
diff --git a/esxi/tests/docker/docker-compose.yaml b/esxi/tests/docker/docker-compose.yaml
index cfa20cc78f0de..2fbc8d7867e11 100644
--- a/esxi/tests/docker/docker-compose.yaml
+++ b/esxi/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   vsphere:
     image: vmware/vcsim:v0.35.0
diff --git a/gearmand/tests/compose/docker-compose.yaml b/gearmand/tests/compose/docker-compose.yaml
index c0ceb1353a468..f391c12b6ba36 100644
--- a/gearmand/tests/compose/docker-compose.yaml
+++ b/gearmand/tests/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   gearman:
     image: ${DOCKER_IMAGE}:${DOCKER_TAG}
diff --git a/gitlab/tests/compose/docker-compose.yml b/gitlab/tests/compose/docker-compose.yml
index e7b750d80cde7..5e9ac6f097ea2 100644
--- a/gitlab/tests/compose/docker-compose.yml
+++ b/gitlab/tests/compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   gitlab:
     image: ${GITLAB_IMAGE:-gitlab/gitlab-ce}:${GITLAB_VERSION}
diff --git a/gitlab_runner/tests/compose/docker-compose.yml b/gitlab_runner/tests/compose/docker-compose.yml
index 4f0b9d2073aed..bb35d8ecd4d6c 100644
--- a/gitlab_runner/tests/compose/docker-compose.yml
+++ b/gitlab_runner/tests/compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   gitlab_runner:
     image: gitlab/gitlab-runner:v${GITLAB_RUNNER_VERSION}
diff --git a/go_expvar/tests/compose/docker-compose.yaml b/go_expvar/tests/compose/docker-compose.yaml
index e267542abcf63..2edf2b34ca6b6 100644
--- a/go_expvar/tests/compose/docker-compose.yaml
+++ b/go_expvar/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   go_expvar:
     build:
diff --git a/gunicorn/tests/compose/docker-compose.yaml b/gunicorn/tests/compose/docker-compose.yaml
index 3543c5e0a3b91..d3fd57f39be25 100644
--- a/gunicorn/tests/compose/docker-compose.yaml
+++ b/gunicorn/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   gunicorn:
     build:
diff --git a/haproxy/tests/compose/haproxy.yaml b/haproxy/tests/compose/haproxy.yaml
index 268391c084202..fe7742518c35b 100644
--- a/haproxy/tests/compose/haproxy.yaml
+++ b/haproxy/tests/compose/haproxy.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   haproxy:
     image: "haproxy:${HAPROXY_VERSION}"
diff --git a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml
index c1eb86470d4c4..393ac868d8c5d 100644
--- a/harbor/tests/compose/harbor-1.10.0/docker-compose.yml
+++ b/harbor/tests/compose/harbor-1.10.0/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   registry:
     image: goharbor/registry-photon:v1.10.11
diff --git a/harbor/tests/compose/harbor-2.0.5/docker-compose.yml b/harbor/tests/compose/harbor-2.0.5/docker-compose.yml
index e5d7b6d4121c8..000b7714163bc 100644
--- a/harbor/tests/compose/harbor-2.0.5/docker-compose.yml
+++ b/harbor/tests/compose/harbor-2.0.5/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   registry:
     image: goharbor/registry-photon:v2.0.5
diff --git a/harbor/tests/compose/harbor-2.3.2/docker-compose.yml b/harbor/tests/compose/harbor-2.3.2/docker-compose.yml
index e2f87d9634b67..24dfedeb1b15d 100644
--- a/harbor/tests/compose/harbor-2.3.2/docker-compose.yml
+++ b/harbor/tests/compose/harbor-2.3.2/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '2.3'
 services:
   registry:
     image: goharbor/registry-photon:v2.3.2
diff --git a/hazelcast/tests/docker/docker-compose.yaml b/hazelcast/tests/docker/docker-compose.yaml
index ec370094003eb..553b19f9512ee 100644
--- a/hazelcast/tests/docker/docker-compose.yaml
+++ b/hazelcast/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   hazelcast1:
     build:
diff --git a/hdfs_datanode/tests/compose/docker-compose.yaml b/hdfs_datanode/tests/compose/docker-compose.yaml
index 86048ed0aae3a..80e9f4e5379f7 100644
--- a/hdfs_datanode/tests/compose/docker-compose.yaml
+++ b/hdfs_datanode/tests/compose/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: '3'
+
 # Inspired from
 # https://github.com/big-data-europe/docker-hadoop
 services:
diff --git a/hdfs_namenode/tests/compose/docker-compose.yaml b/hdfs_namenode/tests/compose/docker-compose.yaml
index 86048ed0aae3a..b46937dc1e0a7 100644
--- a/hdfs_namenode/tests/compose/docker-compose.yaml
+++ b/hdfs_namenode/tests/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 # Inspired from
 # https://github.com/big-data-europe/docker-hadoop
 services:
diff --git a/hive/tests/compose/docker-compose.yaml b/hive/tests/compose/docker-compose.yaml
index dc66571dccd47..adf1779ce7c97 100644
--- a/hive/tests/compose/docker-compose.yaml
+++ b/hive/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   namenode:
     image: bde2020/hadoop-namenode:2.0.0-hadoop2.7.4-java8
diff --git a/hivemq/tests/docker/docker-compose.yaml b/hivemq/tests/docker/docker-compose.yaml
index 83d6967c9ed99..564134a7dc344 100644
--- a/hivemq/tests/docker/docker-compose.yaml
+++ b/hivemq/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   hivemq1:
     image: hivemq/hivemq4:${HIVEMQ_VERSION}
diff --git a/http_check/tests/compose/docker-compose.yml b/http_check/tests/compose/docker-compose.yml
index cc70867db425b..d55d01d60f93e 100644
--- a/http_check/tests/compose/docker-compose.yml
+++ b/http_check/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   # Runs at startup to build certs and exit
   cert-builder:
diff --git a/ibm_mq/tests/compose/docker-compose-v9.yml b/ibm_mq/tests/compose/docker-compose-v9.yml
index b1c9d8b8a0daa..1c652dce083e9 100644
--- a/ibm_mq/tests/compose/docker-compose-v9.yml
+++ b/ibm_mq/tests/compose/docker-compose-v9.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   ibm_mq1:
     container_name: ibm_mq1
diff --git a/ibm_mq/tests/compose/docker-compose-v9cluster.yml b/ibm_mq/tests/compose/docker-compose-v9cluster.yml
index 9cc70b6e6a718..c2c453c383899 100644
--- a/ibm_mq/tests/compose/docker-compose-v9cluster.yml
+++ b/ibm_mq/tests/compose/docker-compose-v9cluster.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   ibm_mq1:
     container_name: ibm_mq1
diff --git a/ignite/tests/compose/docker-compose.yml b/ignite/tests/compose/docker-compose.yml
index 9b5c7a4b76360..65ab1f0e6cbc5 100644
--- a/ignite/tests/compose/docker-compose.yml
+++ b/ignite/tests/compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   ignite:
     container_name: dd-ignite
diff --git a/impala/tests/compose/docker-compose.yaml b/impala/tests/compose/docker-compose.yaml
index 74f3f68629126..4ade0e15c6221 100644
--- a/impala/tests/compose/docker-compose.yaml
+++ b/impala/tests/compose/docker-compose.yaml
@@ -1,6 +1,4 @@
 # This file is based on https://github.com/apache/impala/blob/master/docker/quickstart.yml with minor improvements to make it work OOTB
-
-version: "3"
 services:
   hms:
     image: apache/impala:${IMPALA_VERSION}-impala_quickstart_hms
diff --git a/impala/tests/load_tests/docker-compose.yaml b/impala/tests/load_tests/docker-compose.yaml
index fcd27b91d0657..258bd2579eb94 100644
--- a/impala/tests/load_tests/docker-compose.yaml
+++ b/impala/tests/load_tests/docker-compose.yaml
@@ -1,6 +1,4 @@
 # This file is based on https://github.com/apache/impala/blob/master/docker/quickstart.yml with minor improvements to make it work OOTB
-
-version: "3"
 services:
   hms:
     image: apache/impala:${IMPALA_VERSION}-impala_quickstart_hms
diff --git a/kafka/tests/compose/docker-compose.yml b/kafka/tests/compose/docker-compose.yml
index a17676239154b..4d3737222bb48 100644
--- a/kafka/tests/compose/docker-compose.yml
+++ b/kafka/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   zookeeper:
     image: bitnami/zookeeper:3.8.0
diff --git a/karpenter/tests/docker/docker-compose.yaml b/karpenter/tests/docker/docker-compose.yaml
index fb34a3f05ac02..e6694586da6db 100644
--- a/karpenter/tests/docker/docker-compose.yaml
+++ b/karpenter/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
 
 # Caddy will create host a site with the metrics to exposes
diff --git a/kong/tests/compose/docker-compose.yml b/kong/tests/compose/docker-compose.yml
index ab4f80712e04a..1e5977ff8d7a9 100644
--- a/kong/tests/compose/docker-compose.yml
+++ b/kong/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.1'
-
 volumes:
     kong_data: {}
 
diff --git a/kubernetes_cluster_autoscaler/tests/docker/docker-compose.yaml b/kubernetes_cluster_autoscaler/tests/docker/docker-compose.yaml
index e28cccf4ace86..e0fb9e0c1459b 100644
--- a/kubernetes_cluster_autoscaler/tests/docker/docker-compose.yaml
+++ b/kubernetes_cluster_autoscaler/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
 
   caddy:
diff --git a/kyototycoon/tests/compose/compose_kyototycoon.yaml b/kyototycoon/tests/compose/compose_kyototycoon.yaml
index 6f4433936ed3a..ce1fbb00e36e0 100644
--- a/kyototycoon/tests/compose/compose_kyototycoon.yaml
+++ b/kyototycoon/tests/compose/compose_kyototycoon.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   kyototycoon-standalone:
     image: "datadog/docker-library:kyototycoon_0_9_56"
diff --git a/linkerd/tests/compose/docker-compose.yaml b/linkerd/tests/compose/docker-compose.yaml
index 8b3afd0252123..8797bcba1b6ff 100644
--- a/linkerd/tests/compose/docker-compose.yaml
+++ b/linkerd/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   linkerd:
     build:
diff --git a/mapreduce/tests/compose/docker-compose.yaml b/mapreduce/tests/compose/docker-compose.yaml
index 58ac4c00b6520..54624ed1315bc 100644
--- a/mapreduce/tests/compose/docker-compose.yaml
+++ b/mapreduce/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   namenode:
     image: bde2020/hadoop-namenode:2.0.0-hadoop3.2.1-java8
diff --git a/marathon/tests/compose/docker-compose.yml b/marathon/tests/compose/docker-compose.yml
index f66ee3415dc42..e64c196848c74 100644
--- a/marathon/tests/compose/docker-compose.yml
+++ b/marathon/tests/compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 # References:
 # - https://github.com/fbelzunc/mesos-marathon-docker-example/blob/master/docker-compose.yml
 # - https://github.com/uzyexe/mesos-marathon-demo/blob/master/docker-compose.yml
diff --git a/marklogic/tests/compose/cluster/docker-compose.yml b/marklogic/tests/compose/cluster/docker-compose.yml
index 5089dbd22c4ea..17c446d2cb638 100644
--- a/marklogic/tests/compose/cluster/docker-compose.yml
+++ b/marklogic/tests/compose/cluster/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.6'
-
 services:
   bootstrap:
     image: ${MARKLOGIC_IMAGE}:${MARKLOGIC_TAG}
diff --git a/marklogic/tests/compose/standalone/docker-compose.yml b/marklogic/tests/compose/standalone/docker-compose.yml
index 0c6d6f7201150..4fe3a44f317be 100644
--- a/marklogic/tests/compose/standalone/docker-compose.yml
+++ b/marklogic/tests/compose/standalone/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.6'
-
 services:
   bootstrap:
     container_name: marklogic
diff --git a/mcache/tests/compose/docker-compose.yaml b/mcache/tests/compose/docker-compose.yaml
index d731d1b000046..e143d73f582c8 100644
--- a/mcache/tests/compose/docker-compose.yaml
+++ b/mcache/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   memcached:
     image: datadog/docker-library:memcached_SASL
diff --git a/mesos_master/tests/compose/docker-compose.yml b/mesos_master/tests/compose/docker-compose.yml
index 441c4e14cae69..8e3fd3fddacaa 100644
--- a/mesos_master/tests/compose/docker-compose.yml
+++ b/mesos_master/tests/compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3.5"
 # References:
 # - https://github.com/bobrik/mesos-compose
 # - https://github.com/mesosphere/docker-containers/tree/master/mesos
diff --git a/mesos_slave/tests/compose/docker-compose.yml b/mesos_slave/tests/compose/docker-compose.yml
index c9e31a21305c0..67640435b06a6 100644
--- a/mesos_slave/tests/compose/docker-compose.yml
+++ b/mesos_slave/tests/compose/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.5"
+
 # References:
 # - https://github.com/bobrik/mesos-compose
 # - https://github.com/mesosphere/docker-containers/tree/master/mesos
diff --git a/mongo/tests/compose/mongo-auth.yaml b/mongo/tests/compose/mongo-auth.yaml
index 4175a711ec6b1..69f1d4c3f9aa9 100644
--- a/mongo/tests/compose/mongo-auth.yaml
+++ b/mongo/tests/compose/mongo-auth.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 # This was heavily based upon: https://github.com/chefsplate/mongo-shard-docker-compose
 services:
   standalone-auth:
diff --git a/mongo/tests/compose/mongo-shard.yaml b/mongo/tests/compose/mongo-shard.yaml
index bc7c709a38f48..79d2ab86a820a 100644
--- a/mongo/tests/compose/mongo-shard.yaml
+++ b/mongo/tests/compose/mongo-shard.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 # This was heavily based upon: https://github.com/chefsplate/mongo-shard-docker-compose
 services:
 
diff --git a/mongo/tests/compose/mongo-standalone.yaml b/mongo/tests/compose/mongo-standalone.yaml
index ae0e92d72046d..cf025e6ce41b8 100644
--- a/mongo/tests/compose/mongo-standalone.yaml
+++ b/mongo/tests/compose/mongo-standalone.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   standalone:
     image: mongo:$MONGO_VERSION
diff --git a/mongo/tests/compose/mongo-tls.yaml b/mongo/tests/compose/mongo-tls.yaml
index a8c608aa55251..72cd5dfc3629c 100644
--- a/mongo/tests/compose/mongo-tls.yaml
+++ b/mongo/tests/compose/mongo-tls.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   standalone-tls:
     image: mongo:$MONGO_VERSION
diff --git a/mysql/tests/compose/mariadb.yaml b/mysql/tests/compose/mariadb.yaml
index c98afc6e3966c..ae6041e92edcd 100644
--- a/mysql/tests/compose/mariadb.yaml
+++ b/mysql/tests/compose/mariadb.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   mysql-master:
     image: "${MYSQL_DOCKER_REPO}:${MYSQL_VERSION}"
diff --git a/mysql/tests/compose/mysql.yaml b/mysql/tests/compose/mysql.yaml
index 4df7a0ea7d54b..fbcdc39b348cf 100644
--- a/mysql/tests/compose/mysql.yaml
+++ b/mysql/tests/compose/mysql.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   mysql-master:
     image: "${MYSQL_DOCKER_REPO}:${MYSQL_VERSION}"
diff --git a/mysql/tests/compose/mysql8-group.yaml b/mysql/tests/compose/mysql8-group.yaml
index 342be5b4ed110..fdcf61c378a40 100644
--- a/mysql/tests/compose/mysql8-group.yaml
+++ b/mysql/tests/compose/mysql8-group.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
 
   node1:
diff --git a/mysql/tests/compose/mysql8.yaml b/mysql/tests/compose/mysql8.yaml
index bdbabb678fb01..4e6894cbf331c 100644
--- a/mysql/tests/compose/mysql8.yaml
+++ b/mysql/tests/compose/mysql8.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   mysql-master:
     image: "${MYSQL_DOCKER_REPO}:${MYSQL_VERSION}"
diff --git a/nagios/tests/compose/docker-compose.yaml b/nagios/tests/compose/docker-compose.yaml
index d96fc6cf02027..e79c23d438261 100644
--- a/nagios/tests/compose/docker-compose.yaml
+++ b/nagios/tests/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3.5'
 services:
   nagios:
     build:
diff --git a/nfsstat/tests/compose/compose.yaml b/nfsstat/tests/compose/compose.yaml
index 1ea401fa11b48..d2f98ea3ea2af 100644
--- a/nfsstat/tests/compose/compose.yaml
+++ b/nfsstat/tests/compose/compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   nfs-server:
     image: itsthenetwork/nfs-server-alpine:12
diff --git a/nvidia_triton/tests/docker/docker-compose.yaml b/nvidia_triton/tests/docker/docker-compose.yaml
index 24b124750e50a..85945f6ce6912 100644
--- a/nvidia_triton/tests/docker/docker-compose.yaml
+++ b/nvidia_triton/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
 
 # Caddy will create host a site with the metrics to exposes
diff --git a/openldap/tests/compose/docker-compose.yaml b/openldap/tests/compose/docker-compose.yaml
index f3537dc59cd06..1e0a19fac9740 100644
--- a/openldap/tests/compose/docker-compose.yaml
+++ b/openldap/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 services:
   openldap:
     image: "bitnami/openldap:${OPENLDAP_VERSION}"
diff --git a/openmetrics/tests/compose/docker-compose.yaml b/openmetrics/tests/compose/docker-compose.yaml
index 544cdc54ab6fe..460ad4687d906 100644
--- a/openmetrics/tests/compose/docker-compose.yaml
+++ b/openmetrics/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   openmetrics:
     image: prom/prometheus
diff --git a/openstack_controller/tests/legacy/docker/docker-compose.yaml b/openstack_controller/tests/legacy/docker/docker-compose.yaml
index 72feede33cd11..f5a439df752e6 100644
--- a/openstack_controller/tests/legacy/docker/docker-compose.yaml
+++ b/openstack_controller/tests/legacy/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   openstack-keystone:
     image: caddy:2.6.2-alpine
diff --git a/pgbouncer/tests/compose/docker-compose-old.yml b/pgbouncer/tests/compose/docker-compose-old.yml
index 5f9ed4341189b..f20dcfc26e896 100644
--- a/pgbouncer/tests/compose/docker-compose-old.yml
+++ b/pgbouncer/tests/compose/docker-compose-old.yml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   postgres:
     image: "postgres:13.4"
diff --git a/pgbouncer/tests/compose/docker-compose.yml b/pgbouncer/tests/compose/docker-compose.yml
index 0dae1b0868d7a..ccc9d433295a5 100644
--- a/pgbouncer/tests/compose/docker-compose.yml
+++ b/pgbouncer/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   postgres:
     image: "postgres:13.4"
diff --git a/php_fpm/tests/compose/docker-compose.yml b/php_fpm/tests/compose/docker-compose.yml
index 3e18676abc477..e9633bc73fffb 100644
--- a/php_fpm/tests/compose/docker-compose.yml
+++ b/php_fpm/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   php:
     image: php:7-fpm
diff --git a/postgres/tests/compose/docker-compose-replication.yaml b/postgres/tests/compose/docker-compose-replication.yaml
index 70db92470837b..aa068b36f4b5d 100644
--- a/postgres/tests/compose/docker-compose-replication.yaml
+++ b/postgres/tests/compose/docker-compose-replication.yaml
@@ -1,7 +1,5 @@
-version: '3'
 networks:
   pg-net:
-
 services:
   postgres:
     image: "postgres:${POSTGRES_IMAGE}"
diff --git a/postgres/tests/compose/docker-compose.yaml b/postgres/tests/compose/docker-compose.yaml
index 014c4b9c43797..296174e78cdcf 100644
--- a/postgres/tests/compose/docker-compose.yaml
+++ b/postgres/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   postgres:
     image: "postgres:${POSTGRES_IMAGE}"
diff --git a/powerdns_recursor/tests/compose/powerdns.yaml b/powerdns_recursor/tests/compose/powerdns.yaml
index 40b8df6ed66da..3c632f0b32043 100644
--- a/powerdns_recursor/tests/compose/powerdns.yaml
+++ b/powerdns_recursor/tests/compose/powerdns.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   powerdns_3_7_3:
     image: "${POWERDNS_IMAGE}"
diff --git a/proxysql/tests/compose/docker-compose.yml b/proxysql/tests/compose/docker-compose.yml
index 3c056acbbdddc..cba72d8cb1feb 100644
--- a/proxysql/tests/compose/docker-compose.yml
+++ b/proxysql/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   proxysql:
     image: proxysql/proxysql:${PROXYSQL_VERSION}
diff --git a/rabbitmq/tests/compose/docker-compose.yaml b/rabbitmq/tests/compose/docker-compose.yaml
index 08ac6a3f210ba..84a10f704dc0f 100644
--- a/rabbitmq/tests/compose/docker-compose.yaml
+++ b/rabbitmq/tests/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
 
   rabbitmq:
diff --git a/redisdb/tests/compose/1m-2s-cloud.compose b/redisdb/tests/compose/1m-2s-cloud.compose
index 59cf51ca027cd..0af14208d1cb5 100644
--- a/redisdb/tests/compose/1m-2s-cloud.compose
+++ b/redisdb/tests/compose/1m-2s-cloud.compose
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   redis-master:
     image: "redis:${REDIS_VERSION}"
diff --git a/redisdb/tests/compose/1m-2s.compose b/redisdb/tests/compose/1m-2s.compose
index a4f9cea1f0c48..44574ad9c765b 100644
--- a/redisdb/tests/compose/1m-2s.compose
+++ b/redisdb/tests/compose/1m-2s.compose
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   redis-master:
     image: "redis:${REDIS_VERSION}"
diff --git a/redisdb/tests/compose/standalone.compose b/redisdb/tests/compose/standalone.compose
index b752b608ffa4d..152da961b4076 100644
--- a/redisdb/tests/compose/standalone.compose
+++ b/redisdb/tests/compose/standalone.compose
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   redis-standalone:
     image: "redis:${REDIS_VERSION}"
diff --git a/rethinkdb/tests/compose/docker-compose.yaml b/rethinkdb/tests/compose/docker-compose.yaml
index 18728afcc8bab..62d6630922dff 100644
--- a/rethinkdb/tests/compose/docker-compose.yaml
+++ b/rethinkdb/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   # 3-node RethinkDB cluster with 1 proxy node.
 
diff --git a/riak/tests/compose/riak.yaml b/riak/tests/compose/riak.yaml
index ac5f1d691c0c8..95ffd24bf2d48 100644
--- a/riak/tests/compose/riak.yaml
+++ b/riak/tests/compose/riak.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   redis-standalone:
     image: "basho/riak-kv:ubuntu-2.2.0"
diff --git a/riakcs/tests/compose/docker-compose.yaml b/riakcs/tests/compose/docker-compose.yaml
index 290a529249d6b..98285de02ca04 100644
--- a/riakcs/tests/compose/docker-compose.yaml
+++ b/riakcs/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   dd-test-riakcs:
     image: ianbytchek/riak-cs
diff --git a/scylla/tests/compose/docker-compose.yaml b/scylla/tests/compose/docker-compose.yaml
index 37931362def2c..2f064ded4d6df 100644
--- a/scylla/tests/compose/docker-compose.yaml
+++ b/scylla/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   scylla-db:
     image: scylladb/scylla:${SCYLLA_VERSION}
diff --git a/silk/tests/docker/docker-compose.yaml b/silk/tests/docker/docker-compose.yaml
index e83acb6e18dad..1a182f7674a77 100644
--- a/silk/tests/docker/docker-compose.yaml
+++ b/silk/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   silk:
     image: caddy:2.6.2-alpine
diff --git a/singlestore/tests/compose/docker-compose.yaml b/singlestore/tests/compose/docker-compose.yaml
index 65c70d4ff433a..3dc4da7b91327 100644
--- a/singlestore/tests/compose/docker-compose.yaml
+++ b/singlestore/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '2'
-
 services:
   singlestore:
     image: 'singlestore/cluster-in-a-box:centos-7.5.9-a8744b5453-3.2.11-1.12.1'
diff --git a/snmp/tests/compose/docker-compose.yaml b/snmp/tests/compose/docker-compose.yaml
index affed14b6d88b..615a0d431908e 100644
--- a/snmp/tests/compose/docker-compose.yaml
+++ b/snmp/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   snmp:
     image: "datadog/docker-library:snmp"
diff --git a/sqlserver/tests/compose/docker-compose.yaml b/sqlserver/tests/compose/docker-compose.yaml
index 95a8fd2f562e1..630134061c170 100644
--- a/sqlserver/tests/compose/docker-compose.yaml
+++ b/sqlserver/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   sqlserver:
     # https://hub.docker.com/_/microsoft-mssql-server
diff --git a/squid/tests/compose/squid.yaml b/squid/tests/compose/squid.yaml
index 432cef17f9a8f..0dc2ecdc11a9a 100644
--- a/squid/tests/compose/squid.yaml
+++ b/squid/tests/compose/squid.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   squid:
     image: "ubuntu/squid:${SQUID_VERSION}"
diff --git a/ssh_check/tests/compose/docker-compose-keypair.yml b/ssh_check/tests/compose/docker-compose-keypair.yml
index 197155f445c0b..1410e3701e25b 100644
--- a/ssh_check/tests/compose/docker-compose-keypair.yml
+++ b/ssh_check/tests/compose/docker-compose-keypair.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   dd-test-sshd:
     image: hermsi/alpine-sshd:${SSH_SERVER_IMAGE}
diff --git a/ssh_check/tests/compose/docker-compose.yml b/ssh_check/tests/compose/docker-compose.yml
index 6bc70321fc1ab..34699df2c5b8f 100644
--- a/ssh_check/tests/compose/docker-compose.yml
+++ b/ssh_check/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   dd-test-sshd:
     image: hermsi/alpine-sshd:${SSH_SERVER_IMAGE}
diff --git a/statsd/tests/compose/statsd.yaml b/statsd/tests/compose/statsd.yaml
index f2035bacd6f92..8ef855f3d416e 100644
--- a/statsd/tests/compose/statsd.yaml
+++ b/statsd/tests/compose/statsd.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   statsd:
     build:
diff --git a/supervisord/tests/compose/supervisord.yaml b/supervisord/tests/compose/supervisord.yaml
index 7866f7c523957..751abc5b7db8d 100644
--- a/supervisord/tests/compose/supervisord.yaml
+++ b/supervisord/tests/compose/supervisord.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   supervisord:
     image: datadog/docker-library:supervisord_${SUPERVISOR_VERSION}
diff --git a/teamcity/tests/docker/mockserver/docker-compose.yaml b/teamcity/tests/docker/mockserver/docker-compose.yaml
index 86511174d343e..0fce034da7d1b 100644
--- a/teamcity/tests/docker/mockserver/docker-compose.yaml
+++ b/teamcity/tests/docker/mockserver/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   teamcity:
     image: mockserver/mockserver:latest
diff --git a/temporal/tests/compose/docker-compose.yaml b/temporal/tests/compose/docker-compose.yaml
index 04ad715bd2f9b..91af1fd28659f 100644
--- a/temporal/tests/compose/docker-compose.yaml
+++ b/temporal/tests/compose/docker-compose.yaml
@@ -1,5 +1,4 @@
 # https://github.com/temporalio/docker-compose
-version: "3.9"
 services:
   elasticsearch:
     container_name: temporal-elasticsearch
diff --git a/tls/tests/compose/docker-compose.yml b/tls/tests/compose/docker-compose.yml
index 1864bb14886cb..9f1db3df7b794 100644
--- a/tls/tests/compose/docker-compose.yml
+++ b/tls/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   # Runs at startup to build certs and exit
   cert-builder:
diff --git a/tokumx/tests/compose/docker-compose.yaml b/tokumx/tests/compose/docker-compose.yaml
index 7c05ade77a1d8..c269514fed062 100644
--- a/tokumx/tests/compose/docker-compose.yaml
+++ b/tokumx/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '2.1'
-
 services:
 
   tokumx:
diff --git a/tomcat/tests/compose/embedded/docker-compose.yml b/tomcat/tests/compose/embedded/docker-compose.yml
index db388aa47145c..84a27daf5f66f 100644
--- a/tomcat/tests/compose/embedded/docker-compose.yml
+++ b/tomcat/tests/compose/embedded/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   tomcat:
     build:
diff --git a/tomcat/tests/compose/standalone/docker-compose.yml b/tomcat/tests/compose/standalone/docker-compose.yml
index 6cfef44178733..5ca9594982fe8 100644
--- a/tomcat/tests/compose/standalone/docker-compose.yml
+++ b/tomcat/tests/compose/standalone/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   db:
     image: mariadb:10.6
diff --git a/traffic_server/tests/compose/docker-compose.yaml b/traffic_server/tests/compose/docker-compose.yaml
index cd4c340adf5ef..ac9422248d115 100644
--- a/traffic_server/tests/compose/docker-compose.yaml
+++ b/traffic_server/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   trafficserver:
     image: shaker/trafficserver:${TRAFFIC_SERVER_VERSION}
diff --git a/twemproxy/tests/compose/docker-compose.yaml b/twemproxy/tests/compose/docker-compose.yaml
index e0ad36fe3115a..96274339294ad 100644
--- a/twemproxy/tests/compose/docker-compose.yaml
+++ b/twemproxy/tests/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   redis1:
     image: redis
diff --git a/varnish/tests/compose/docker-compose-4-5.yaml b/varnish/tests/compose/docker-compose-4-5.yaml
index 09812a7d59497..ea29baa942f1f 100644
--- a/varnish/tests/compose/docker-compose-4-5.yaml
+++ b/varnish/tests/compose/docker-compose-4-5.yaml
@@ -1,4 +1,3 @@
-version: '3.5'
 services:
 
   varnish:
diff --git a/varnish/tests/compose/docker-compose.yaml b/varnish/tests/compose/docker-compose.yaml
index 3a9a7e95d4077..bed382ab95a9b 100644
--- a/varnish/tests/compose/docker-compose.yaml
+++ b/varnish/tests/compose/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: '3.5'
 services:
   varnish:
     image: varnish:6.5.1
diff --git a/vertica/tests/docker/docker-compose.yaml b/vertica/tests/docker/docker-compose.yaml
index 0f266d5c6b84f..6bbf612c608e9 100644
--- a/vertica/tests/docker/docker-compose.yaml
+++ b/vertica/tests/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   vertica:
     build:
diff --git a/voltdb/tests/compose/docker-compose.yaml b/voltdb/tests/compose/docker-compose.yaml
index 4e81d127470b5..d4334eae666b6 100644
--- a/voltdb/tests/compose/docker-compose.yaml
+++ b/voltdb/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   voltdb0:
     image: ${VOLTDB_IMAGE}
diff --git a/weblogic/tests/compose/docker-compose.yml b/weblogic/tests/compose/docker-compose.yml
index a57246d2db503..7327fb2d15918 100644
--- a/weblogic/tests/compose/docker-compose.yml
+++ b/weblogic/tests/compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   weblogic-admin-server:
     build:
diff --git a/yarn/tests/compose/docker-compose.yaml b/yarn/tests/compose/docker-compose.yaml
index 25a1a89d03f3a..72ed85f0ded00 100644
--- a/yarn/tests/compose/docker-compose.yaml
+++ b/yarn/tests/compose/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   resourcemanager:
     image: apache/hadoop:${YARN_VERSION}
diff --git a/zk/tests/compose/zk.yaml b/zk/tests/compose/zk.yaml
index 75aaa5abe9da2..4ba5561b58008 100644
--- a/zk/tests/compose/zk.yaml
+++ b/zk/tests/compose/zk.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   zk:
     image: "zookeeper:${ZK_VERSION}"
diff --git a/zk/tests/compose/zk35.yaml b/zk/tests/compose/zk35.yaml
index f2a4421b62ee5..f5ab32579dfd3 100644
--- a/zk/tests/compose/zk35.yaml
+++ b/zk/tests/compose/zk35.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   zk:
     image: "zookeeper:${ZK_VERSION}"
diff --git a/zk/tests/compose/zk35_ssl.yaml b/zk/tests/compose/zk35_ssl.yaml
index 0f8fb64aef2f2..2e03edbe2fa64 100644
--- a/zk/tests/compose/zk35_ssl.yaml
+++ b/zk/tests/compose/zk35_ssl.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   zk:
     image: "zookeeper:${ZK_VERSION}"
diff --git a/zk/tests/compose/zk36plus.yaml b/zk/tests/compose/zk36plus.yaml
index b97bb2315706e..9ec827d44ac7f 100644
--- a/zk/tests/compose/zk36plus.yaml
+++ b/zk/tests/compose/zk36plus.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   zk:
     image: "zookeeper:${ZK_VERSION}"
diff --git a/zk/tests/compose/zk36plus_ssl.yaml b/zk/tests/compose/zk36plus_ssl.yaml
index ec3f4c09d7914..475ef933d4790 100644
--- a/zk/tests/compose/zk36plus_ssl.yaml
+++ b/zk/tests/compose/zk36plus_ssl.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 services:
   zk:
     image: "zookeeper:${ZK_VERSION}"