diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 836ff21..bfc57c3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v2
       -
         name: Test building snapshot
-        run: docker-compose run --rm chirpstack-rest-api make snapshot
+        run: docker compose run --rm chirpstack-rest-api make snapshot
 
   dist:
     needs: test
@@ -35,7 +35,7 @@ jobs:
           aws-region: eu-west-1
       -
         name: Build distributable binaries
-        run: docker-compose run --rm chirpstack-rest-api make dist
+        run: docker compose run --rm chirpstack-rest-api make dist
       -
         name: Upload binaries to S3
         if: startsWith(github.ref, 'refs/tags/v')
diff --git a/Makefile b/Makefile
index b562c82..3a969ed 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ dev-requirements:
 	go install github.com/goreleaser/nfpm/v2/cmd/nfpm
 
 devshell:
-	docker-compose run --rm chirpstack-rest-api bash
+	docker compose run --rm chirpstack-rest-api bash
 
 generate:
 	go get -u github.com/chirpstack/chirpstack/api/go/v4@${VERSION}