diff --git a/config/runtime.exs b/config/runtime.exs
index c4df2aa..3e85f6c 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -22,9 +22,6 @@ if cookie = System.get_env("RELEASE_COOKIE") do
   config :elixir, :cookie, cookie
 end
 
-config :customer_service, CustomerServiceWeb.Endpoint,
-  http: [port: String.to_integer(System.get_env("PORT", "8080"))]
-
 if config_env() == :prod do
   database_url =
     System.get_env("DATABASE_URL") ||
@@ -35,7 +32,8 @@ if config_env() == :prod do
 
   config :workload_service, WorkloadService.EventStore,
     serializer: Commanded.Serialization.JsonSerializer,
-    url: event_store_database_url,
+    url: database_url,
+    schema: "eventstore",
     pool_size: String.to_integer(System.get_env("EVENT_STORE_POOL_SIZE") || "10")
 
   maybe_ipv6 = if System.get_env("ECTO_IPV6") in ~w(true 1), do: [:inet6], else: []
@@ -45,12 +43,6 @@ if config_env() == :prod do
     pool_size: 1,
     socket_options: maybe_ipv6
 
-  config :customer_service, CustomerService.EventStore,
-    serializer: Commanded.Serialization.JsonSerializer,
-    url: database_url,
-    schema: "eventstore",
-    pool_size: 1
-
   secret_key_base =
     System.get_env("SECRET_KEY_BASE") ||
       raise """
@@ -63,9 +55,10 @@ if config_env() == :prod do
   config :customer_service, :dns_cluster_query, System.get_env("DNS_CLUSTER_QUERY")
 
   config :customer_service, CustomerServiceWeb.Endpoint,
-    url: [host: host, port: 80, scheme: "http"],
+    url: [host: host, port: String.to_integer(System.get_env("PORT", "8080")), scheme: "http"],
     http: [
-      ip: {0, 0, 0, 0, 0, 0, 0, 0}
+      ip: {0, 0, 0, 0, 0, 0, 0, 0},
+      port: String.to_integer(System.get_env("PORT", "8080"))
     ],
     secret_key_base: secret_key_base
 end