diff --git a/.github/workflows/deploy-fdr-dev.yml b/.github/workflows/deploy-fdr-dev.yml
index 27e1db8663..18a12fdfd4 100644
--- a/.github/workflows/deploy-fdr-dev.yml
+++ b/.github/workflows/deploy-fdr-dev.yml
@@ -39,7 +39,7 @@ jobs:
       matrix:
         concurrency: [1]
     env:
-      DATABASE_URL: ${{ secrets.DATABASE_URL }}/fdr?schema=public
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}/fdr?schema=public&connection_limit=6&pool_timeout=30
       ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
       ALGOLIA_ADMIN_API_KEY: ${{ secrets.ALGOLIA_ADMIN_API_KEY }}
       ALGOLIA_SEARCH_INDEX: ${{ secrets.ALGOLIA_SEARCH_INDEX }}
@@ -85,7 +85,7 @@ jobs:
           cd servers/fdr-deploy
           VERSION="${git_version}" pnpm --filter=@fern-platform/fdr-deploy deploy:dev
         env:
-          DATABASE_URL: ${{ secrets.DEV_POSTGRES_URL }}/fdr?schema=public
+          DATABASE_URL: ${{ secrets.DEV_POSTGRES_URL }}/fdr?schema=public&connection_limit=6&pool_timeout=30
 
   smoke-test:
     needs: deploy_dev
diff --git a/.github/workflows/deploy-fdr-prod.yml b/.github/workflows/deploy-fdr-prod.yml
index 307409dea9..9da10342e9 100644
--- a/.github/workflows/deploy-fdr-prod.yml
+++ b/.github/workflows/deploy-fdr-prod.yml
@@ -30,7 +30,7 @@ jobs:
     if: github.ref_type == 'tag' && github.event_name == 'push'  && startsWith(github.ref, 'refs/tags/fdr@')
     environment: Fern Prod
     env:
-      DATABASE_URL: ${{ secrets.DATABASE_URL }}/fdr?schema=public
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}/fdr?schema=public&connection_limit=6&pool_timeout=30
       ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
       ALGOLIA_ADMIN_API_KEY: ${{ secrets.ALGOLIA_ADMIN_API_KEY }}
       ALGOLIA_SEARCH_INDEX: ${{ secrets.ALGOLIA_SEARCH_INDEX }}
diff --git a/servers/fdr/.env.dev b/servers/fdr/.env.dev
index 92bad11dba..0f46fb730a 100644
--- a/servers/fdr/.env.dev
+++ b/servers/fdr/.env.dev
@@ -1 +1 @@
-DATABASE_URL="postgresql://${POSTGRES_USERNAME}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/fdr?schema=public&connection_limit=4"
\ No newline at end of file
+DATABASE_URL="postgresql://${POSTGRES_USERNAME}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/fdr?schema=public&connection_limit=4&pool_timeout=30"
\ No newline at end of file
diff --git a/servers/fdr/.env.prod b/servers/fdr/.env.prod
index 4f792c370e..2acf618f37 100644
--- a/servers/fdr/.env.prod
+++ b/servers/fdr/.env.prod
@@ -1 +1 @@
-DATABASE_URL="postgresql://${POSTGRES_USERNAME}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/fdr?schema=public&connection_limit=6"
+DATABASE_URL="postgresql://${POSTGRES_USERNAME}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/fdr?schema=public&connection_limit=6&pool_timeout=30"