diff --git a/Makefile b/Makefile
index 78b35f6..8f2a691 100644
--- a/Makefile
+++ b/Makefile
@@ -20,4 +20,4 @@ lint-yaml: $(YAMLLINT)
 
 .PHONY: test-smoke
 test-smoke:
-	docker-compose -f docker-compose.yml -f docker-compose-ci.yml config
+	docker compose -f docker-compose.yml -f docker-compose-ci.yml config
diff --git a/streamr-docker-dev/bin.sh b/streamr-docker-dev/bin.sh
index 6e50eeb..52b2978 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=500     # seconds
-DOCKER_COMPOSE="docker-compose --ansi never -f docker-compose.yml"
+DOCKER_COMPOSE="docker compose --ansi never -f docker-compose.yml run"
 if [ -n "${CI-}" ]; then # Apply CI override when running on CI server
 	DOCKER_COMPOSE="$DOCKER_COMPOSE -f docker-compose-ci.yml"
 fi