diff --git a/Dockerfile b/Dockerfile
index 9fda8a5..03d3325 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,4 @@ RUN mkdir -p /data/uploads && chmod 755 /data/uploads
 
 EXPOSE 8080
 
-ENTRYPOINT ["sh", "-c", "exec java ${JAVA_OPTS} -jar app.jar"]
+CMD ["java", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7ee937f..0ef8c6b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -67,8 +67,7 @@ services:
       POSTGRES_HOST: db
       STORAGE_SERVICE_URL: http://storage:8081
       SPRING_PROFILES_ACTIVE: docker
-
-      JAVA_OPTS: "-DYANDEX_API_KEY=AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q -DYANDEX_FOLDER_ID=b1gokpdbm6qfpsou8pcd -DYANDEX_SEARCH_URL='https://searchapi.api.cloud.yandex.net/v2/image/search_by_image'"
+      SPRING_APPLICATION_JSON: '{"yandex":{"api-key":"AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q","folder-id":"b1gokpdbm6qfpsou8pcd","search-url":"https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"}}'
 
     depends_on:
       - db
diff --git a/src/main/java/ru/soune/nocopy/service/YandexSearchService.java b/src/main/java/ru/soune/nocopy/service/YandexSearchService.java
index 66f3f18..257fd90 100644
--- a/src/main/java/ru/soune/nocopy/service/YandexSearchService.java
+++ b/src/main/java/ru/soune/nocopy/service/YandexSearchService.java
@@ -28,19 +28,18 @@ import java.util.Map;
 @Service
 @RequiredArgsConstructor
 public class YandexSearchService {
-
     private final FileEntityRepository fileEntityRepository;
+
     private final ObjectMapper objectMapper;
 
-    @Value("${YANDEX_API_KEY}")
+    @Value("${yandex.api-key}")
     private String apiKey;
 
-    @Value("${YANDEX_FOLDER_ID}")
+    @Value("${yandex.folder-id}")
     private String folderId;
 
-    @Value("${YANDEX_SEARCH_URL}")
+    @Value("${yandex.search-url}")
     private String searchUrl;
-
     @PostConstruct
     public void init() {
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index da03a23..77d6ac6 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -40,6 +40,11 @@ security:
     allowed-headers: "*"
     allow-credentials: true
 
+yandex:
+  api-key: ${yandex.api-key}
+  folder-id: ${yandex.folder-id}
+  search-url: ${yandex.search-url}
+
 server:
   port: ${SERVER_PORT:8080}