diff --git a/lib/policy_service_web/endpoint.ex b/lib/policy_service_web/endpoint.ex
index e21f913..d21ede0 100644
--- a/lib/policy_service_web/endpoint.ex
+++ b/lib/policy_service_web/endpoint.ex
@@ -45,5 +45,10 @@ defmodule PolicyServiceWeb.Endpoint do
   plug Plug.MethodOverride
   plug Plug.Head
   plug Plug.Session, @session_options
+
+  plug CORSPlug,
+    origin: ["*"],
+    headers: ["*"]
+
   plug PolicyServiceWeb.Router
 end
diff --git a/lib/policy_service_web/router.ex b/lib/policy_service_web/router.ex
index 4792641..b08ebe0 100644
--- a/lib/policy_service_web/router.ex
+++ b/lib/policy_service_web/router.ex
@@ -5,10 +5,6 @@ defmodule PolicyServiceWeb.Router do
   alias PolicyServiceWeb.HealthController
 
   pipeline :api do
-    plug CORSPlug,
-      origin: ["*"],
-      headers: ["*"]
-
     plug OpenApiSpex.Plug.PutApiSpec, module: PolicyServiceWeb.ApiSpec
   end