diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8716d1a0..04c41655 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,34 +4,37 @@ on:
     branches:
       - master
   pull_request:
-
+    branches:
+      - master
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       # Checkout the code
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
       # Install .NET Core SDK
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 7.0.x
-
+          dotnet-version: 8.0.x
+      # Setup
       - name: Start containers
-        run: docker-compose -f "submodules/btcpayserver/BTCPayServer.Tests/docker-compose.yml" up dev -d
-
+        run: docker-compose -f "submodules/btcpayserver/BTCPayServer.Tests/docker-compose.yml" up -d dev
       - name: Start BTCPay
-        run: cd submodules/btcpayserver && nohup dotnet run -c Release &
-
-      - name: Wait for BTCPay to start
         run: |
-          while ! curl -s http://localhost:14142/a[ov1/health > /dev/null; do
-            echo "Waiting for BTCPay to start..."
-            sleep 1
+          cd submodules/btcpayserver
+          nohup dotnet run -c Release --project BTCPayServer &
+          while ! curl -s http://localhost:14142/api/v1/health > /dev/null; do
+            echo "Waiting for BTCPay Server to start..."
+            sleep 5
           done
-
-      - name: Run tests
-        run: dotnet test
-          
\ No newline at end of file
+      # Test
+      - name: Run fast tests
+        run: dotnet test --filter "Fast=Fast" --no-build -v n --logger "console;verbosity=normal"
+      - name: Run integration tests
+        run: dotnet test --filter "Integration=Integration" --no-build -v n --logger "console;verbosity=normal"
+      - name: Run Selenium tests
+        run: dotnet test --filter "Selenium=Selenium" --no-build -v n --logger "console;verbosity=normal"