diff --git a/API/Program.cs b/API/Program.cs
index 8937b35..20b73ea 100644
--- a/API/Program.cs
+++ b/API/Program.cs
@@ -62,10 +62,10 @@ NpgsqlConnectionStringBuilder connectionStringBuilder = new()
     Username = Environment.GetEnvironmentVariable("POSTGRES_USER") ?? "postgres",
     Password = Environment.GetEnvironmentVariable("POSTGRES_PASSWORD") ?? "postgres",
     ConnectionLifetime = 300,
-    Timeout = 5,
+    Timeout = int.Parse(Environment.GetEnvironmentVariable("POSTGRES_CONNECTION_TIMEOUT") ?? "30"),
     ReadBufferSize = 65536,
     WriteBufferSize = 65536,
-    CommandTimeout = int.Parse(Environment.GetEnvironmentVariable("POSTGRES_COMMAND_TIMEOUT") ?? "60") ,
+    CommandTimeout = int.Parse(Environment.GetEnvironmentVariable("POSTGRES_COMMAND_TIMEOUT") ?? "60"),
     ApplicationName = "Tranga"
 };
 
diff --git a/README.md b/README.md
index 295b694..e00fcc1 100644
--- a/README.md
+++ b/README.md
@@ -125,15 +125,16 @@ downloaded (where Komga/Kavita can access them for example).
 The file also includes [tranga-website](https://github.com/C9Glax/tranga-website) as frontend. For its configuration refer to the
 [Tranga-Website Repository](https://github.com/C9Glax/tranga-website) README.
 
-| env-var                  | default-value                                                                            |
-|--------------------------|------------------------------------------------------------------------------------------|
-| POSTGRES_HOST            | `tranga-pg:5432`                                                                         |
-| POSTGRES_DB              | `postgres`                                                                               |
-| POSTGRES_USER            | `postgres`                                                                               |
-| POSTGRES_PASSWORD        | `postgres`                                                                               |
-| DOWNLOAD_LOCATION        | `/Manga`                                                                                 |
-| FLARESOLVERR_URL         | <empty>                                                                                  |
-| POSTGRES_COMMAND_TIMEOUT | [`60`](https://www.npgsql.org/doc/connection-string-parameters.html?q=Command%20Timeout) |
+| env-var                     | default-value                                                                            |
+|-----------------------------|------------------------------------------------------------------------------------------|
+| POSTGRES_HOST               | `tranga-pg:5432`                                                                         |
+| POSTGRES_DB                 | `postgres`                                                                               |
+| POSTGRES_USER               | `postgres`                                                                               |
+| POSTGRES_PASSWORD           | `postgres`                                                                               |
+| DOWNLOAD_LOCATION           | `/Manga`                                                                                 |
+| FLARESOLVERR_URL            | <empty>                                                                                  |
+| POSTGRES_COMMAND_TIMEOUT    | [`60`](https://www.npgsql.org/doc/connection-string-parameters.html?q=Command%20Timeout) |
+| POSTGRES_CONNECTION_TIMEOUT | `30`                                                                                     |
 
 For compatibility do not execute the compose as root (which you should not do anyways...) but as user that can
 access the folder. Permission conflicts with Komga and Kavita should thus be limited.