diff --git a/config/dev.exs b/config/dev.exs
index 7a68ef14a..607867451 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -69,7 +69,7 @@ config :mobilizon, Mobilizon.Storage.Repo,
   password: System.get_env("MOBILIZON_DATABASE_PASSWORD", "mobilizon"),
   database: System.get_env("MOBILIZON_DATABASE_DBNAME", "mobilizon_dev"),
   hostname: System.get_env("MOBILIZON_DATABASE_HOST", "localhost"),
-  port: "5432",
+  port: System.get_env("MOBILIZON_DATABASE_PORT", "5432"),
   pool_size: 10,
   show_sensitive_data_on_connection_error: true
 
diff --git a/config/test.exs b/config/test.exs
index a8ba75e47..e3ec7abcb 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -32,6 +32,7 @@ config :mobilizon, Mobilizon.Storage.Repo,
   password: System.get_env("MOBILIZON_DATABASE_PASSWORD") || "mobilizon",
   database: System.get_env("MOBILIZON_DATABASE_DBNAME") || "mobilizon_test",
   hostname: System.get_env("MOBILIZON_DATABASE_HOST") || "localhost",
+  port: System.get_env("MOBILIZON_DATABASE_PORT") || "5432",
   pool: Ecto.Adapters.SQL.Sandbox
 
 config :mobilizon, Mobilizon.Web.Email.Mailer, adapter: Bamboo.TestAdapter