diff --git a/src/main/java/net/hostsharing/hsadminng/HsadminNgApplication.java b/src/main/java/net/hostsharing/hsadminng/HsadminNgApplication.java
index a1180099..60510ca2 100644
--- a/src/main/java/net/hostsharing/hsadminng/HsadminNgApplication.java
+++ b/src/main/java/net/hostsharing/hsadminng/HsadminNgApplication.java
@@ -3,6 +3,9 @@ package net.hostsharing.hsadminng;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @SpringBootApplication
 @OpenAPIDefinition
@@ -11,4 +14,20 @@ public class HsadminNgApplication {
     public static void main(String[] args) {
         SpringApplication.run(HsadminNgApplication.class, args);
     }
+
+    @Bean
+        public WebMvcConfigurer corsConfigurer() {
+           return new WebMvcConfigurer() {
+
+               @Override
+               public void addCorsMappings(CorsRegistry registry) {
+                   String allowedOrigins = System.getenv("ALLOWED_ORIGINS");
+                   if (allowedOrigins == null || allowedOrigins.length() <= 1) {
+                       allowedOrigins = "*";
+                   }
+                   registry.addMapping("/api/**").allowedOrigins(allowedOrigins);
+               }
+           };
+       }
+
 }