diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7dbca144..09a27bf0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,10 +20,10 @@ jobs:
           POSTGRES_PASSWORD: secret
         image: postgres:16.2-alpine
         options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-retries 5
-          --health-timeout 5s
+          --health-cmd "pg_isready -h 127.0.0.1"
+          --health-interval 1s
+          --health-retries 30
+          --health-timeout 2s
         ports:
           - 5432:5432
 
diff --git a/{{ cookiecutter.name }}/.github/workflows/ci.yml b/{{ cookiecutter.name }}/.github/workflows/ci.yml
index e184859c..4301fc43 100644
--- a/{{ cookiecutter.name }}/.github/workflows/ci.yml	
+++ b/{{ cookiecutter.name }}/.github/workflows/ci.yml	
@@ -60,10 +60,10 @@ jobs:
         env:
           POSTGRES_PASSWORD: secret
         options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          --health-cmd "pg_isready -h 127.0.0.1"
+          --health-interval 1s
+          --health-timeout 2s
+          --health-retries 30
         ports:
           - 5432:5432