diff --git a/firmware/config/config.exs b/firmware/config/config.exs
index d8cb81f..ef11786 100644
--- a/firmware/config/config.exs
+++ b/firmware/config/config.exs
@@ -5,6 +5,8 @@
 # is restricted to this project.
 use Mix.Config
 
+import_config "../../ui/config/config.exs"
+
 config :firmware, target: Mix.target()
 
 # Customize non-Elixir parts of the firmware. See
@@ -26,16 +28,6 @@ config :shoehorn,
 
 config :logger, backends: [RingLogger]
 
-config :ui, UiWeb.Endpoint,
-  url: [host: "localhost"],
-  http: [port: 80],
-  secret_key_base: "HEY05EB1dFVSu6KykKHuS4rQPQzSHv4F7mGVB/gnDLrIu75wE/ytBXy2TaL3A6RA",
-  root: Path.dirname(__DIR__),
-  server: true,
-  render_errors: [view: UiWeb.ErrorView, accepts: ~w(html json)],
-  pubsub: [name: Nerves.PubSub, adapter: Phoenix.PubSub.PG2],
-  code_reloader: false
-
 config :phoenix, :json_library, Jason
 
 if Mix.target() != :host do
diff --git a/ui/config/config.exs b/ui/config/config.exs
index dc1d064..95439ea 100644
--- a/ui/config/config.exs
+++ b/ui/config/config.exs
@@ -9,7 +9,6 @@ use Mix.Config
 
 # Configures the endpoint
 config :ui, UiWeb.Endpoint,
-  url: [host: "localhost"],
   secret_key_base: "FkfuB09FEncz4aAi6hS6w5bsNast+D1P12MckXr5dlRdhtFJrKqgEhvhpTU3qzgh",
   render_errors: [view: UiWeb.ErrorView, accepts: ~w(html json)],
   pubsub: [name: Ui.PubSub, adapter: Phoenix.PubSub.PG2]
diff --git a/ui/config/prod.exs b/ui/config/prod.exs
index ff57908..753148a 100644
--- a/ui/config/prod.exs
+++ b/ui/config/prod.exs
@@ -11,7 +11,6 @@ use Mix.Config
 # before starting your production server.
 config :ui, UiWeb.Endpoint,
   url: [host: "www.geokunis2.nl", port: 80],
-  check_origin: false,
   cache_static_manifest: "priv/static/cache_manifest.json"
 
 # Do not print debug messages in production
diff --git a/ui/config/prod.secret.exs b/ui/config/prod.secret.exs
index 622dd97..8ee8fff 100644
--- a/ui/config/prod.secret.exs
+++ b/ui/config/prod.secret.exs
@@ -12,7 +12,6 @@ secret_key_base =
     """
 
 config :ui, UiWeb.Endpoint,
-  http: [:inet6, port: String.to_integer(System.get_env("PORT") || "4000")],
   secret_key_base: secret_key_base
 
 # ## Using releases (Elixir v1.9+)