diff --git a/config/dev.exs b/config/dev.exs
index 139b816..d96bd7e 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -5,7 +5,7 @@ config :mv, Mv.Repo,
   username: "postgres",
   password: "postgres",
   hostname: "localhost",
-  port: 5000,
+  port: String.to_integer(System.get_env("DB_PORT") || "5000"),
   database: "mv_dev",
   stacktrace: true,
   show_sensitive_data_on_connection_error: true,
@@ -97,9 +97,9 @@ config :mv, :token_signing_secret, "IwUwi65TrEeExwBXXFPGm2I7889NsL"
 # do not set defaults here so the SSO button stays hidden and no MissingSecret occurs.
 # config :mv, :oidc,
 #   client_id: "mv",
-#   base_url: "http://localhost:8080/auth/v1",
+#   base_url: "http://localhost:#{System.get_env("RAUTHY_PORT") || "8080"}/auth/v1",
 #   client_secret: System.get_env("OIDC_CLIENT_SECRET"),
-#   redirect_uri: "http://localhost:4000/auth/user/oidc/callback"
+#   redirect_uri: "http://localhost:#{System.get_env("PORT") || "4000"}/auth/user/oidc/callback"
 
 # AshAuthentication development configuration
 config :mv, :session_identifier, :jti
diff --git a/config/test.exs b/config/test.exs
index 7343a6a..10ab4e8 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -9,7 +9,7 @@ config :mv, Mv.Repo,
   username: "postgres",
   password: "postgres",
   hostname: System.get_env("TEST_POSTGRES_HOST", "localhost"),
-  port: System.get_env("TEST_POSTGRES_PORT", "5000"),
+  port: System.get_env("TEST_POSTGRES_PORT") || System.get_env("DB_PORT") || "5000",
   database: "mv_test#{System.get_env("MIX_TEST_PARTITION")}",
   pool: Ecto.Adapters.SQL.Sandbox,
   pool_size: System.schedulers_online() * 8,