diff --git a/config/runtime.exs b/config/runtime.exs
index 5882821..f577a2f 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -35,6 +35,11 @@ if amqp_url do
   config :policy_service, :amqp_url, amqp_url
 end
 
+cors_origin = System.get_env("CORS_ORIGIN", "*")
+
+config :cors_plug,
+  origin: cors_origin
+
 # ## Using releases
 #
 # If you use `mix release`, you need to explicitly enable the server
diff --git a/lib/policy_service/events/policy.ex b/lib/policy_service/events/policy.ex
index 6323f3d..3a097ef 100644
--- a/lib/policy_service/events/policy.ex
+++ b/lib/policy_service/events/policy.ex
@@ -40,7 +40,7 @@ defmodule PolicyService.Events.Policy do
 
   defmodule AllQuotesReceived do
     @derive Jason.Encoder
-    defstruct [:id, :org_id, :quote_count]
+    defstruct [:id, :quote_count]
   end
 
   defmodule QuoteAccepted do
diff --git a/lib/policy_service_web/endpoint.ex b/lib/policy_service_web/endpoint.ex
index 139ca0e..027d793 100644
--- a/lib/policy_service_web/endpoint.ex
+++ b/lib/policy_service_web/endpoint.ex
@@ -42,7 +42,7 @@ defmodule PolicyServiceWeb.Endpoint do
     pass: ["*/*"],
     json_decoder: Phoenix.json_library()
 
-  plug CORSPlug, origin: ["http://localhost:3000"]
+  plug CORSPlug
   plug Plug.MethodOverride
   plug Plug.Head
   plug Plug.Session, @session_options
diff --git a/ops/chart/values.yaml b/ops/chart/values.yaml
index 3624e0d..5bc8d80 100644
--- a/ops/chart/values.yaml
+++ b/ops/chart/values.yaml
@@ -39,6 +39,8 @@ controllers:
           LOG_LEVEL: debug
           MIX_ENV: prod
           PORT: "8080"
+          CORS_ORIGIN:
+            value: "*"
           PHX_HOST: "0.0.0.0"
           PHX_SERVER: "true"
           RABBITMQ_HOST: