Index: src/main/java/mk/ukim/finki/db/distributorapp/_security/SecurityConfig.java
===================================================================
--- src/main/java/mk/ukim/finki/db/distributorapp/_security/SecurityConfig.java	(revision 12f2d0b563b7d5322cf491f86c7c005462aa91c6)
+++ src/main/java/mk/ukim/finki/db/distributorapp/_security/SecurityConfig.java	(revision 3342453412af6c42705af3b85344722f732ee964)
@@ -5,4 +5,5 @@
 import mk.ukim.finki.db.distributorapp._security.jwt.JwtAuthenticationFilter;
 import mk.ukim.finki.db.distributorapp._security.jwt.JwtTokenProvider;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -36,4 +37,7 @@
     private final SuperUserAuthenticationProvider superUserAuthenticationProvider;
     private final JwtTokenProvider jwtTokenProvider;
+
+    @Value("${management.endpoints.web.cors.allowed-origins}")
+    private String allowedOrigins;
 
     @Bean
@@ -76,5 +80,5 @@
         CorsConfiguration configuration = new CorsConfiguration();
 
-        configuration.setAllowedOrigins(List.of("https://10.0.2.2:8443","https://192.168.31.100:8443"));
+        configuration.setAllowedOrigins(List.of(allowedOrigins.split(",")));
         configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS"));
         configuration.setAllowedHeaders(List.of("*"));
Index: src/main/resources/application-prod.properties
===================================================================
--- src/main/resources/application-prod.properties	(revision 12f2d0b563b7d5322cf491f86c7c005462aa91c6)
+++ src/main/resources/application-prod.properties	(revision 3342453412af6c42705af3b85344722f732ee964)
@@ -1,3 +1,6 @@
 server.port=8443
+
+## CORS Configuration
+management.endpoints.web.cors.allowed-origins=${ALLOWED_ORIGINS}
 
 ## -------------------POSTGRESQL & JPA-------------------