diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d0c265ebe..5e6af5ab6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -62,7 +62,7 @@ jobs:
       - name: Build
         run: |
           npm run build -- --cache-dir=".turbo"
-      - run: cd e2e && docker-compose build && cd ..
+      - run: cd e2e && docker compose build && cd ..
       # In this step, this action saves a list of existing images,
       # the cache is created without them in the post run.
       # It also restores the cache if it exists.
diff --git a/e2e/run-e2e-services.cmd b/e2e/run-e2e-services.cmd
index c351acc25..a350f67d1 100644
--- a/e2e/run-e2e-services.cmd
+++ b/e2e/run-e2e-services.cmd
@@ -5,14 +5,14 @@ call npm ci
 cd ..
 cd e2e
 
-docker-compose up -d
+docker compose up -d
 
 echo *** Waiting for services... ***
 timeout /t 15 /nobreak >nul
 echo.
 
 echo *** Deploying contracts... ***
-docker-compose exec hardhat-node npm run deploy
+docker compose exec hardhat-node npm run deploy
 if %ERRORLEVEL% NEQ 0 (
   echo Contracts couldn't be deployed
   exit /B 1
@@ -34,6 +34,6 @@ echo *** Successfully deployed subgraph ***
 echo.
 
 set /p DUMMY=*** Press any key to shutdown services ***
-docker-compose down -v
+docker compose down -v
 rmdir /S /Q .\data
 cd ..
\ No newline at end of file
diff --git a/e2e/run-e2e-services.sh b/e2e/run-e2e-services.sh
index ec7f286f6..3d3ea54d1 100755
--- a/e2e/run-e2e-services.sh
+++ b/e2e/run-e2e-services.sh
@@ -3,7 +3,7 @@
 trap cleanup EXIT INT TERM
 
 function cleanup() {
-  docker-compose down -v
+  docker compose down -v
   rm -rf ./data
   exit
 }
@@ -14,7 +14,7 @@ npm ci
 cd ..
 cd e2e
 
-docker-compose up -d #--build
+docker compose up -d #--build
 
 echo "Waiting for services..."
 sleep 15
diff --git a/e2e/run-e2e-suite.cmd b/e2e/run-e2e-suite.cmd
index ca26a55a0..5b7890e6c 100644
--- a/e2e/run-e2e-suite.cmd
+++ b/e2e/run-e2e-suite.cmd
@@ -5,14 +5,14 @@ call npm ci
 cd ..
 cd e2e
 
-docker-compose up -d
+docker compose up -d
 
 echo *** Waiting for services... ***
 timeout /t 15 /nobreak >nul
 echo.
 
 echo *** Deploying contracts... ***
-docker-compose exec hardhat-node npm run deploy
+docker compose exec hardhat-node npm run deploy
 if %ERRORLEVEL% NEQ 0 (
   echo Contracts couldn't be deployed
   exit /B 1
@@ -35,6 +35,6 @@ call npm run e2e:test -- --no-cache
 set EXIT_STATUS=%ERRORLEVEL%
 
 cd e2e
-docker-compose down -v
+docker compose down -v
 cd ..
 exit %EXIT_STATUS%
\ No newline at end of file
diff --git a/e2e/run-e2e-suite.sh b/e2e/run-e2e-suite.sh
index a8af24b8d..53e70cdfc 100755
--- a/e2e/run-e2e-suite.sh
+++ b/e2e/run-e2e-suite.sh
@@ -5,7 +5,7 @@ trap cleanup EXIT INT TERM
 function cleanup() {
   exit_status=$?
   cd e2e
-  docker-compose down -v
+  docker compose down -v
   exit "$exit_status"
 }
 
@@ -15,7 +15,7 @@ npm ci
 cd ..
 cd e2e
 
-docker-compose up -d
+docker compose up -d
 
 echo "Waiting for services..."
 sleep 15