diff --git a/apps/api/config/cors.json b/apps/api/config/cors.json
new file mode 100644
index 0000000..0929a4c
--- /dev/null
+++ b/apps/api/config/cors.json
@@ -0,0 +1,17 @@
+{
+  "cors": {
+    "allowedHeaders": [
+      "Authorization",
+      "Content-Type",
+      "accept-language",
+      "x-trpc-source",
+      "x-user-locale",
+      "x-user-timezone",
+      "x-user-country"
+    ],
+    "allowMethods": ["GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"],
+    "exposeHeaders": ["Content-Length"],
+    "maxAge": 86400,
+    "origin": "%env(BASANGO_API_ALLOWED_ORIGINS)%"
+  }
+}
diff --git a/apps/api/config/server.json b/apps/api/config/server.json
new file mode 100644
index 0000000..5a46462
--- /dev/null
+++ b/apps/api/config/server.json
@@ -0,0 +1,7 @@
+{
+  "server": {
+    "host": "%env(BASANGO_API_HOST)%",
+    "port": "%env(number:BASANGO_API_PORT)%",
+    "version": "1.0.0"
+  }
+}
diff --git a/apps/api/src/config.ts b/apps/api/src/config.ts
index 64c50ee..119916c 100644
--- a/apps/api/src/config.ts
+++ b/apps/api/src/config.ts
@@ -11,7 +11,7 @@ const ServerConfigurationSchema = z.object({
     allowMethods: z.array(z.string()).optional(),
     exposeHeaders: z.array(z.string()).optional(),
     maxAge: z.number().int().min(0).optional(),
-    origin: z.array(z.string()).default([]),
+    origin: z.string(), //z.array(z.string()).default([]),
   }),
   server: z.object({
     host: z.string().default("localhost"),
diff --git a/apps/api/src/config/config.json b/apps/api/src/config/config.json
deleted file mode 100644
index ac9ba9c..0000000
--- a/apps/api/src/config/config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "allowedHeaders": [
-    "Authorization",
-    "Content-Type",
-    "accept-language",
-    "x-trpc-source",
-    "x-user-locale",
-    "x-user-timezone",
-    "x-user-country"
-  ],
-  "allowMethods": ["GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"],
-  "exposeHeaders": ["Content-Length"],
-  "maxAge": 86400,
-  "origin": "%env(BASANGO_API_ALLOWED_ORIGINS)%"
-}
diff --git a/apps/api/src/config/server.json b/apps/api/src/config/server.json
deleted file mode 100644
index 56c7e52..0000000
--- a/apps/api/src/config/server.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "host": "%env(BASANGO_API_HOST)%",
-  "port": "%env(number:BASANGO_API_PORT)%",
-  "version": "1.0.0"
-}