diff --git a/build.gradle b/build.gradle
index 160bf48..12b9512 100644
--- a/build.gradle
+++ b/build.gradle
@@ -131,7 +131,11 @@ tasks.register('copyAngularBuild_prod', Copy) {
 // Говорим задаче обработки ресурсов, что она НЕ ДОЛЖНА трогать статику фронтенда,
 // пока фронтенд-задача не закончит свою работу.
 processResources {
-    dependsOn copyAngularBuild_prod
+    if (!gradle.startParameter.taskNames.any { it.toLowerCase().contains("dev") })
+    {
+        dependsOn copyAngularBuild_prod
+    }
+
 }
 tasks.register('copyAngularBuild_dev', Copy) {
 	group = "_jambotron_build"
diff --git a/jambotron-ui/src/environments/environment.prod.ts b/jambotron-ui/src/environments/environment.prod.ts
index 64700ba..fbd74db 100644
--- a/jambotron-ui/src/environments/environment.prod.ts
+++ b/jambotron-ui/src/environments/environment.prod.ts
@@ -3,6 +3,6 @@ export const environment = {
   port: 8081,
   production: true,
   fromWeb: true,
-  host_name:'https://jambotron.com',
+  host_name: typeof window !== 'undefined' ? window.location.origin : 'https://default-api.com',
   title: 'JAMBOTRON.COM'
 };
diff --git a/jambotron-ui/src/environments/environment.ts b/jambotron-ui/src/environments/environment.ts
index ef44e66..9425949 100644
--- a/jambotron-ui/src/environments/environment.ts
+++ b/jambotron-ui/src/environments/environment.ts
@@ -3,6 +3,7 @@ export const environment = {
   port: 8080,
   production: true,
   fromWeb: false,
-  host_name: 'http://localhost',
+  //host_name: 'http://localhost',
+  host_name: typeof window !== 'undefined' ? window.location.origin : 'https://default-api.com',
   title: 'Jambotron'
 };
diff --git a/src/main/java/com/jambotronGroup/jambotron/security/WebSecurityConfig.java b/src/main/java/com/jambotronGroup/jambotron/security/WebSecurityConfig.java
index edb4391..fa2fd0e 100644
--- a/src/main/java/com/jambotronGroup/jambotron/security/WebSecurityConfig.java
+++ b/src/main/java/com/jambotronGroup/jambotron/security/WebSecurityConfig.java
@@ -160,7 +160,7 @@ public class WebSecurityConfig implements WebMvcConfigurer {// extends WebSecuri
 		registry.addResourceHandler("/" + dirName + "/**").addResourceLocations("file:/"+ uploadPath + "/");
 	}
 
-    @Override
+   /* @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
                 // Разрешаем основной домен, стейджинг и вложенные проекты пользователей
@@ -173,7 +173,7 @@ public class WebSecurityConfig implements WebMvcConfigurer {// extends WebSecuri
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
                 .allowedHeaders("*")
                 .allowCredentials(true); // Нужно для работы с сессиями и куками
-    }
+    }*/
 }
 
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 31a9236..39634b2 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 #bootJar with profile prod
-spring.profiles.active=prod
+#spring.profiles.active=prod
 
-#spring.profiles.active=dev
+spring.profiles.active=dev