diff --git a/Makefile b/Makefile
index 40529c7..0b8181e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ SHELL := /bin/bash
 YAMLLINT := /usr/local/bin/yamllint
 YAMLLINTFLAGS := --config-file yamllint-config.yaml
 
+COMPOSE := docker compose
+
 $(YAMLLINT):
 	pip3 install --user yamllint
 
@@ -20,7 +22,7 @@ lint-yaml: $(YAMLLINT)
 
 .PHONY: test-smoke
 test-smoke:
-	docker-compose -f docker-compose.yml -f docker-compose-ci.yml config
+	$(COMPOSE) -f docker-compose.yml -f docker-compose-ci.yml config
 
 .PHONY: test-docker-dev
 test-docker-dev:
diff --git a/README.md b/README.md
index 4ac24f9..0b97098 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ ln -sf $(pwd)/streamr-docker-dev/bin.sh /usr/local/bin/streamr-docker-dev
 
 The docker stack has not been tested in a Windows environment and is not recommended at this time.
 
-If you know what services you need, you don't need to use the `bin.sh`, you can just use `docker-compose` directly, like so:
+If you know what services you need, you don't need to use the `bin.sh`, you can just use `docker compose` directly, like so:
 
 1. Install and start Docker service.
 
@@ -48,7 +48,7 @@ If you know what services you need, you don't need to use the `bin.sh`, you can
 
 3. Bind the loopback interface to 10.200.10.1: `netsh int ip add address "Loopback" 10.200.10.1`
 
-4. For instance, for the Ethereum environment without core-api: `docker-compose up parity-node0 parity-sidechain-node0 bridge`
+4. For instance, for the Ethereum environment without core-api: `docker compose up parity-node0 parity-sidechain-node0 bridge`
 
 ## Quickstart
 
@@ -287,8 +287,7 @@ I received this error only during `docker login`, after login I could resume usi
 
 | File                        | Description                                                    |
 |:-----------------------------|:----------------------------------------------------------------|
-| docker-compose.yml          | Supporting services stack (MySQL, Cassandra, Redis, etc.)      |
-| docker-compose.override.yml | Streamr service stack                                          |
+| docker-compose.yml          | Streamr and supporting services stack (MySQL, Cassandra, Redis, etc.)|
 | custom-mysql-settings.cnf   | Custom MySQL settings                                          |
 | mysql\_init\_scripts        | Database dumps used to initalize MySQL databases               |
 | keyspace.cql                | Keyspace definitions and demo data for Cassandra               |
diff --git a/streamr-docker-dev/bin.sh b/streamr-docker-dev/bin.sh
index bf7e325..c1debdf 100755
--- a/streamr-docker-dev/bin.sh
+++ b/streamr-docker-dev/bin.sh
@@ -16,7 +16,7 @@ DRY_RUN=0
 FOLLOW=0
 WAIT=0
 WAIT_TIMEOUT=300     # seconds
-DOCKER_COMPOSE="docker-compose --ansi never -f docker-compose.yml"
+DOCKER_COMPOSE="docker compose --ansi never -f docker-compose.yml"
 if [ -n "${CI-}" ]; then # Apply CI override when running on CI server
 	DOCKER_COMPOSE="$DOCKER_COMPOSE -f docker-compose-ci.yml"
 fi
@@ -147,7 +147,7 @@ wait() {
     while [[ $time_waited -lt $WAIT_TIMEOUT ]]; do
         waiting_for_services=()
 
-        # Get the id of each image we have in docker-compose
+        # Get the id of each image we have in docker compose
         for image_id in $($DOCKER_COMPOSE ps -q)
         do
             service_name=$(docker inspect -f "{{.Name}}" "$image_id")
diff --git a/streamr-docker-dev/help_scripts.sh b/streamr-docker-dev/help_scripts.sh
index 4dc2cf6..e7ce0c6 100755
--- a/streamr-docker-dev/help_scripts.sh
+++ b/streamr-docker-dev/help_scripts.sh
@@ -137,7 +137,7 @@ Examples:
 
 pull_help() {
 echo "
-Pulls images defined in docker-compose files. If no services are given, pulls all of them.
+Pulls images defined in docker compose files. If no services are given, pulls all of them.
 
 Usage: streamr-docker-dev pull [ [--] <service>...]