diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 27baecc7c..53e9c481b 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -2,14 +2,17 @@ name: runs test on dev/staging
 on:
   push:
     branches:
-      - master
+      - '*'
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout Code
         uses: actions/checkout@v2
+      - name: Verify Docker Compose Installation
+        run: |
+          docker compose --version || echo "docker-compose not found"
       - name: Run Tests
         run: |
           make ci
diff --git a/Makefile b/Makefile
index b311adbf5..de49c3588 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,8 @@ else
     ENV_ARG  := test
 endif
 
-COMPOSE_DEV  := docker-compose
-COMPOSE_TEST := docker-compose -f docker-compose.test.yml
+COMPOSE_DEV  := docker compose
+COMPOSE_TEST := docker compose -f docker-compose.test.yml
 BASH         := run --rm gibct bash --login
 BASH_DEV     := $(COMPOSE_DEV) $(BASH) -c
 BASH_TEST    := $(COMPOSE_TEST) $(BASH) -c