diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cd37fafde..29b7b7275 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,9 +29,9 @@ jobs:
            - 5432:5432
         options: >-
           --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 1s
+          --health-timeout 2s
+          --health-retries 30
     steps:
       - uses: actions/checkout@v6
       - name: Set up Ruby ${{ matrix.ruby }}
@@ -87,9 +87,9 @@ jobs:
            - 5432:5432
         options: >-
           --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-interval 1s
+          --health-timeout 2s
+          --health-retries 30
     steps:
       - uses: actions/checkout@v6
       - name: Setup the environment