diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7444797f4..05804463a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -390,14 +390,14 @@ jobs:
 
       - name: Run E2E tests with docker-compose
         run: |
-          docker-compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner
+          docker compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner
         env:
           COMPOSE_INTERACTIVE_NO_CLI: 1
 
       - name: Cleanup
         if: always()
         run: |
-          docker-compose -f docker-compose.test.yml down -v
+          docker compose -f docker-compose.test.yml down -v
 
   # Assert that the Azure custom-role actions list is identical in the TF module
   # and the ARM onboarding template.  Fast (shell + jq only), so it always runs.
diff --git a/Makefile b/Makefile
index ddb735e6c..d67f45b58 100644
--- a/Makefile
+++ b/Makefile
@@ -229,8 +229,8 @@ cost-estimate:
 # Docker Compose E2E tests
 docker-compose-test:
 	@echo "Running E2E tests with docker-compose..."
-	docker-compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner
-	docker-compose -f docker-compose.test.yml down -v
+	docker compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from test-runner
+	docker compose -f docker-compose.test.yml down -v
 
 # Install development dependencies
 install-dev-tools: