diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7c94fc4..d2e6b82 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,11 +1,12 @@
-# copy of https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md
+name: CI
+
 on:
   push:
-    branches: [main]
-  pull_request_review:
-    types: [submitted]
-
-name: CI
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - '**'
 
 jobs:
   fmt:
@@ -21,22 +22,14 @@ jobs:
 
   check:
     name: Check
-    if: github.event.review.state == 'approved'
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            toolchain: stable-x86_64-unknown-linux-gnu
-          - os: macos-latest
-            toolchain: stable-x86_64-apple-darwin
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
       - name: Checkout submodules
         run: git submodule update --init --recursive
-      - uses: actions/setup-go@v4 # we need go to build go-waku
+      - uses: actions/setup-go@v4
         with:
           go-version: '1.19'
       - uses: actions-rs/toolchain@v1
@@ -56,35 +49,43 @@ jobs:
 
   test:
     name: Test Suite
-    if: github.event.review.state == 'approved'
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            toolchain: stable-x86_64-unknown-linux-gnu
-          - os: macos-latest
-            toolchain: stable-x86_64-apple-darwin
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:12
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: test_db
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    env:
+      DATABASE_URL: postgres://postgres:postgres@localhost:5432/test_db
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
       - name: Checkout submodules
         run: git submodule update --init --recursive
-      - uses: actions/setup-go@v4 # we need go to build go-waku
+      - uses: actions/setup-go@v4
         with:
           go-version: '1.19'
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ matrix.toolchain }}
+          toolchain: stable-x86_64-unknown-linux-gnu
           default: true
           override: true
+      - name: Run Database Migrations
+        run: cargo sqlx migrate run
       - uses: actions-rs/cargo@v1
-        continue-on-error: false
         with:
           command: build
       - uses: actions-rs/cargo@v1
-        continue-on-error: false
         with:
           command: test