diff --git a/application/src/main/resources/application-dev.yml b/application/src/main/resources/application-dev.yml
index 98d3b87..9921998 100644
--- a/application/src/main/resources/application-dev.yml
+++ b/application/src/main/resources/application-dev.yml
@@ -1,10 +1,51 @@
 logging:
-    level:
-        org:
-            gxf:
-                soapbridge: DEBUG
+  level:
+    org:
+      gxf:
+        soapbridge: DEBUG
+
 spring:
-    kafka:
-        bootstrap-servers: localhost:9092
-        consumer:
-            group-id: gxf-proxy
+  kafka:
+    bootstrap-servers: localhost:9092
+    consumer:
+      group-id: gxf-proxy
+
+proxy-server:
+    network-zone: IT
+
+security:
+  key-store:
+    location: /etc/ssl/certs
+    password: 1234
+    type: pkcs12
+  trust-store:
+    location: /etc/ssl/certs/trust.jks
+    password: 123456
+    type: jks
+  signing:
+    key-type: RSA
+    sign-key-file: /etc/ssl/certs/proxy-server/sign-key.der
+    verify-key-file: /etc/ssl/certs/proxy-server/verify-key.der
+    provider: SunRsaSign
+    signature: SHA256withRSA
+
+topics:
+    calls:
+        requests: proxy-server-calls-requests
+        responses: proxy-server-calls-responses
+    notifications:
+        requests: proxy-server-notification-requests
+        responses: proxy-server-notification-responses
+
+soap:
+    notification:
+        host: localhost
+        port: 443
+        protocol: https
+    platform:
+        host: localhost
+        port: 443
+        protocol: https
+    hostname-verification-strategy: BROWSER_COMPATIBLE_HOSTNAMES
+    time-out: 45
+    custom-timeouts: SetScheduleRequest,180,GetStatusRequest,120
diff --git a/application/src/main/resources/application.yaml b/application/src/main/resources/application.yaml
index 0ddc75a..4f84fa6 100644
--- a/application/src/main/resources/application.yaml
+++ b/application/src/main/resources/application.yaml
@@ -3,43 +3,3 @@ management:
     web:
       exposure:
         include: prometheus
-
-proxy-server:
-  network-zone: IT
-
-security:
-  key-store:
-    location: /etc/ssl/certs
-    password: 1234
-    type: pkcs12
-  trust-store:
-    location: /etc/ssl/certs/trust.jks
-    password: 123456
-    type: jks
-  signing:
-    key-type: RSA
-    sign-key-file: /etc/ssl/certs/proxy-server/sign-key.der
-    verify-key-file: /etc/ssl/certs/proxy-server/verify-key.der
-    provider: SunRsaSign
-    signature: SHA256withRSA
-
-topics:
-  calls:
-    requests: proxy-server-calls-requests
-    responses: proxy-server-calls-responses
-  notifications:
-    requests: proxy-server-notification-requests
-    responses: proxy-server-notification-responses
-
-soap:
-  notification:
-    host: localhost
-    port: 443
-    protocol: https
-  platform:
-    host: localhost
-    port: 443
-    protocol: https
-  hostname-verification-strategy: BROWSER_COMPATIBLE_HOSTNAMES
-  time-out: 45
-  custom-timeouts: SetScheduleRequest,180,GetStatusRequest,120