diff --git a/backend/gateway/src/main/resources/application-gateway-external-tls.yml b/backend/gateway/src/main/resources/application-gateway-external-tls.yml
new file mode 100644
index 00000000..0c57f11b
--- /dev/null
+++ b/backend/gateway/src/main/resources/application-gateway-external-tls.yml
@@ -0,0 +1,4 @@
+server:
+  ssl:
+    key-store: classpath:keystore/itmo-dating-external.p12
+    key-store-password: ${ITMO_DATING_EXT_KEY_STORE_PASSWORD}
diff --git a/backend/gateway/src/main/resources/application.yml b/backend/gateway/src/main/resources/application.yml
index ecf18086..701d212f 100644
--- a/backend/gateway/src/main/resources/application.yml
+++ b/backend/gateway/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   config:
-    import: application-monitoring.yml,application-service-discovery.yml,application-tls.yml
+    import: application-monitoring.yml,application-service-discovery.yml,application-tls.yml,application-gateway-external-tls.yml
   application:
     name: gateway
   cloud:
@@ -132,10 +132,6 @@ spring:
           predicates:
             - Method=GET
             - Path=/api/locations
-server:
-  ssl:
-    key-store: classpath:keystore/itmo-dating-external.p12
-    key-store-password: ${ITMO_DATING_EXT_KEY_STORE_PASSWORD}
 springdoc:
   swagger-ui:
     path: /swagger-ui.html
diff --git a/backend/starter-service-discovery/src/main/resources/application-service-discovery.yml b/backend/starter-service-discovery/src/main/resources/application-service-discovery.yml
index bac24e34..bfece753 100644
--- a/backend/starter-service-discovery/src/main/resources/application-service-discovery.yml
+++ b/backend/starter-service-discovery/src/main/resources/application-service-discovery.yml
@@ -9,9 +9,9 @@ spring:
       tls:
         key-store-instance-type: JKS
         certificate-path: keystore/itmo-dating-backend.jks
-        certificate-password: ${server.ssl.key-store-password}
+        certificate-password: ${client.ssl.key-store-password}
         key-store-path: keystore/itmo-dating-backend.jks
-        key-store-password: ${server.ssl.key-store-password}
+        key-store-password: ${client.ssl.key-store-password}
       discovery:
         enabled: true
         scheme: https