diff --git a/config/config.exs b/config/config.exs
index 169e9ec85..33b032d9c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -10,7 +10,7 @@ config :mobilizon,
   ecto_repos: [Mobilizon.Repo]
 
 config :mobilizon, :instance,
-  name: "Localhost",
+  name: System.get_env("MOBILIZON_INSTANCE_NAME") || "Localhost",
   version: "1.0.0-dev",
   registrations_open: true
 
diff --git a/config/prod.exs b/config/prod.exs
index 476ce44af..afd7919e8 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -15,7 +15,10 @@ use Mix.Config
 # which you typically run after static files are built.
 config :mobilizon, MobilizonWeb.Endpoint,
   load_from_system_env: true,
-  url: [host: "example.com", port: 80],
+  url: [
+    host: System.get_env("MOBILIZON_HOST") || "example.com",
+    port: 80
+  ],
   cache_static_manifest: "priv/static/cache_manifest.json"
 
 config :mobilizon, Mobilizon.Mailer,