diff --git a/src/main/java/com/olympus/hermione/controllers/CanvasController.java b/src/main/java/com/olympus/hermione/controllers/CanvasController.java
index 8defbb1..8d21e8b 100644
--- a/src/main/java/com/olympus/hermione/controllers/CanvasController.java
+++ b/src/main/java/com/olympus/hermione/controllers/CanvasController.java
@@ -1,7 +1,6 @@
 package com.olympus.hermione.controllers;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -12,7 +11,6 @@ import com.olympus.hermione.services.CanvasExecutionService;
 
 
 @RestController
-@CrossOrigin
 public class CanvasController {
     
     @Autowired
diff --git a/src/main/java/com/olympus/hermione/controllers/ScenarioController.java b/src/main/java/com/olympus/hermione/controllers/ScenarioController.java
index 49487f6..3e62c41 100644
--- a/src/main/java/com/olympus/hermione/controllers/ScenarioController.java
+++ b/src/main/java/com/olympus/hermione/controllers/ScenarioController.java
@@ -1,7 +1,6 @@
 package com.olympus.hermione.controllers;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,7 +17,6 @@ import com.olympus.hermione.services.ScenarioExecutionService;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @RestController
-@CrossOrigin
 public class ScenarioController {
     
     @Autowired
diff --git a/src/main/java/com/olympus/hermione/security/config/CorsConfig.java b/src/main/java/com/olympus/hermione/security/config/CorsConfig.java
index 1d704b8..7ea22cb 100644
--- a/src/main/java/com/olympus/hermione/security/config/CorsConfig.java
+++ b/src/main/java/com/olympus/hermione/security/config/CorsConfig.java
@@ -1,15 +1,21 @@
 package com.olympus.hermione.security.config;
 
+
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 public class CorsConfig implements WebMvcConfigurer {
+
+  @Value("${hermione.fe.url}")
+  private String hermione_frontend_url;
+
   @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("*")
+                .allowedOrigins(hermione_frontend_url)
                 .allowedHeaders("*")
                 .allowedMethods("GET", "POST", "PUT", "DELETE");
     }
diff --git a/src/main/java/com/olympus/hermione/security/controllers/AuthController.java b/src/main/java/com/olympus/hermione/security/controllers/AuthController.java
index c1bd6d3..598cb58 100644
--- a/src/main/java/com/olympus/hermione/security/controllers/AuthController.java
+++ b/src/main/java/com/olympus/hermione/security/controllers/AuthController.java
@@ -7,7 +7,6 @@ import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,7 +20,6 @@ import com.olympus.hermione.security.entity.User;
 import com.olympus.hermione.security.utility.JwtTokenProvider;
 
 @RestController
-@CrossOrigin
 @RequestMapping("/api/auth")
 public class AuthController {