diff --git a/src/main/java/de/anxietyprime/swajodel/Routes.java b/src/main/java/de/anxietyprime/swajodel/Routes.java
index 2fb8409..b5085d5 100644
--- a/src/main/java/de/anxietyprime/swajodel/Routes.java
+++ b/src/main/java/de/anxietyprime/swajodel/Routes.java
@@ -9,7 +9,6 @@ import java.sql.*;
 import java.util.Optional;
 import java.util.Vector;
 
-@CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
 public class Routes {
 
diff --git a/src/main/java/de/anxietyprime/swajodel/SwaJodelApplication.java b/src/main/java/de/anxietyprime/swajodel/SwaJodelApplication.java
index 5f88a2d..f3e5daf 100644
--- a/src/main/java/de/anxietyprime/swajodel/SwaJodelApplication.java
+++ b/src/main/java/de/anxietyprime/swajodel/SwaJodelApplication.java
@@ -2,6 +2,9 @@ package de.anxietyprime.swajodel;
 
 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
 public class SwaJodelApplication {
@@ -10,4 +13,16 @@ public class SwaJodelApplication {
         SpringApplication.run(SwaJodelApplication.class, args);
     }
 
+    @Bean
+    public WebMvcConfigurer corsConfigurer() {
+        return new WebMvcConfigurer() {
+            @Override
+            public void addCorsMappings(CorsRegistry registry) {
+                registry.addMapping("/**").allowedOrigins("localhost:3000");
+                registry.addMapping("/**").allowedOrigins("jodel.local.anxietyprime.de");
+                registry.addMapping("/**").allowedOrigins("jodel.anxietyprime.de");
+            }
+        };
+    }
+
 }