diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
index 53db5df7c4..c1c5facf5c 100644
--- a/.github/workflows/agent.yml
+++ b/.github/workflows/agent.yml
@@ -93,7 +93,7 @@ jobs:
       - name: Build and install
         run: make install
 
-      - name: Docker-compose
+      - name: Launch containers
         env:
           ENV_UP_FLAGS: "--detach"
         run: make env-up
diff --git a/admin/Makefile b/admin/Makefile
index 59e7b4c6d0..f6c12416e1 100644
--- a/admin/Makefile
+++ b/admin/Makefile
@@ -51,8 +51,8 @@ test-cover:                     ## Run tests and collect cross-package coverage
 	go test $(TEST_FLAGS) -race -coverprofile=cover.out -covermode=atomic -coverpkg=./... ./...
 
 env-up:                         ## Start development environment
-	docker-compose up --force-recreate --abort-on-container-exit --renew-anon-volumes --remove-orphans
+	docker compose up --force-recreate --abort-on-container-exit --renew-anon-volumes --remove-orphans
 
 env-down:                       ## Stop development environment
-	docker-compose down --volumes --remove-orphans
+	docker compose down --volumes --remove-orphans
 
diff --git a/agent/Makefile b/agent/Makefile
index c170223a4d..89752a2672 100644
--- a/agent/Makefile
+++ b/agent/Makefile
@@ -110,10 +110,10 @@ env-up:                         ## Start development environment
 	mkdir -p testdata/mysql/slowlogs
 	chmod -R 0777 testdata
 
-	docker-compose up $(ENV_UP_FLAGS)
+	docker compose up $(ENV_UP_FLAGS)
 
 env-down:                       ## Stop development environment
-	docker-compose down --volumes --remove-orphans
+	docker compose down --volumes --remove-orphans
 
 setup-dev: install              ## Run pmm-agent setup in development environment
 	pmm-agent setup $(RUN_FLAGS) --server-insecure-tls --server-address=127.0.0.1:${PMM_DEV_SERVER_PORT} --server-username=admin --server-password=admin --paths-exporters_base=$(GOPATH)/bin --force
@@ -128,13 +128,13 @@ env-psql:                       ## Run psql client
 	docker exec -ti pmm-agent_postgres env PGPASSWORD=pmm-agent-password psql --username=pmm-agent
 
 env-sysbench-prepare:
-	docker-compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
+	docker compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
 		--db-driver=pgsql --pgsql-host=postgres --pgsql-user=pmm-agent --pgsql-password=pmm-agent-password --pgsql-db=pmm-agent \
 		--threads=1 --time=0 --report-interval=10 \
 		--tables=1 --scale=10  --use_fk=0 --enable_purge=yes prepare
 
 env-sysbench-run:
-	docker-compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
+	docker compose exec --workdir=/sysbench/sysbench-tpcc sysbench ./tpcc.lua \
 		--db-driver=pgsql --pgsql-host=postgres --pgsql-user=pmm-agent --pgsql-password=pmm-agent-password --pgsql-db=pmm-agent \
 		--threads=4 --time=0 --rate=10 --report-interval=10 --percentile=99 \
 		--tables=1 --scale=10  --use_fk=0 --enable_purge=yes run
diff --git a/agent/docker-compose-pg-load.yml b/agent/docker-compose-pg-load.yml
index a2c238007e..c912224f49 100644
--- a/agent/docker-compose-pg-load.yml
+++ b/agent/docker-compose-pg-load.yml
@@ -1,5 +1,5 @@
 ---
- # docker-compose -f docker-compose-pg-load.yml up
+ # docker compose -f docker-compose-pg-load.yml up
 version: '3.7'
 
 services:
diff --git a/qan-api2/Makefile b/qan-api2/Makefile
index 534b5828d0..a0381b7b23 100644
--- a/qan-api2/Makefile
+++ b/qan-api2/Makefile
@@ -74,17 +74,17 @@ _run:
 
 env-up:                         ## Run ClickHouse, MySQL Server and sysbench containers. Create pmm DB in ClickHouse
 	mkdir -p logs
-	docker-compose up -d $(DCFLAGS) --force-recreate --renew-anon-volumes --remove-orphans ch sysbench-ps
-	#docker-compose up $(DCFLAGS) ch sysbench-pstpcc
+	docker compose up -d $(DCFLAGS) --force-recreate --renew-anon-volumes --remove-orphans ch sysbench-ps
+	# docker compose up $(DCFLAGS) ch sysbench-pstpcc
 	sleep 60
 	docker exec ch-server clickhouse client -h 127.0.0.1 --query="CREATE DATABASE IF NOT EXISTS pmm;"
 
 env-down:                       ## Remove docker containers
-	docker-compose down --volumes
+	docker compose down --volumes
 	rm -rf logs
 
 pmm-env-up:                     ## Run PMM server, MySQL Server and sysbench containers
-	docker-compose up -d --force-recreate --renew-anon-volumes --remove-orphans $(PMM_CONTAINER)
+	docker compose up -d --force-recreate --renew-anon-volumes --remove-orphans $(PMM_CONTAINER)
 	docker exec $(PMM_CONTAINER) sed -i 's|<!-- <listen_host>0.0.0.0</listen_host> -->|<listen_host>0.0.0.0</listen_host>|g' /etc/clickhouse-server/config.xml
 	docker exec $(PMM_CONTAINER) supervisorctl restart clickhouse
 	docker exec $(PMM_CONTAINER) supervisorctl stop qan-api2
diff --git a/update/Makefile b/update/Makefile
index fb3afa5c60..d5af7cde0b 100644
--- a/update/Makefile
+++ b/update/Makefile
@@ -64,10 +64,10 @@ _run:
 	pmm-update $(RUN_FLAGS)
 
 env-up:                         ## Start development environment
-	docker-compose up --force-recreate --abort-on-container-exit --renew-anon-volumes --remove-orphans
+	docker compose up --force-recreate --abort-on-container-exit --renew-anon-volumes --remove-orphans
 
 env-down:                       ## Stop development environment
-	docker-compose down --volumes --remove-orphans
+	docker compose down --volumes --remove-orphans
 
 install-dev-tools:
 	docker exec pmm-update-server /root/go/src/github.com/percona/pmm/update/.devcontainer/install-dev-tools.sh