diff --git a/ifn-collateral.yml b/ifn-collateral.yml
new file mode 100644
index 0000000..4c9171e
--- /dev/null
+++ b/ifn-collateral.yml
@@ -0,0 +1,65 @@
+# GLOBAL CONFIGURATION
+spring:
+  application:
+    name: ifn-collateral
+  jpa:
+    hibernate:
+      ddl-auto: none
+    properties:
+      org:
+        hibernate:
+          envers:
+            store_data_at_delete: true
+      hibernate:
+        jdbc:
+          batch_size: 100
+        order_insert: true
+  datasource:
+    driverClassName: org.h2.Driver
+    # server mode
+    url: jdbc:h2:tcp://localhost:1521/ifn_co;COMPRESS=TRUE;JMX=TRUE
+    username: sa
+    password:
+  kafka:
+    consumer:
+      group-id: ${spring.application.name}
+      auto-offset-reset: latest
+      enable-auto-commit: false
+    producer:
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: de.infinnit.commons.business.kafka.IfnJsonSerializer
+    listener:
+      ack-mode: MANUAL
+    properties:
+      isolation:
+        level: read_committed
+# New Changes after upgrade to 2.1.6
+  main:
+    allow-bean-definition-overriding: true
+  liquibase:
+    enabled: true
+    change-log: classpath:/liquibase/master_test.xml
+
+server:
+  max-http-header-size: 16000
+  error:
+    path: /mvc-error
+
+management:
+  server:
+    servlet:
+      context-path: /actuator
+ 
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 60000
+        readTimeout: 60000
+        error-decoder: de.infinnit.commons.business.error.payments.PaymentsErrorDecoder
+#  security:
+#    enabled: false
+
+#endpoints:
+#  dump:
+#    id: threaddump
diff --git a/ifn-competence.yml b/ifn-competence.yml
new file mode 100644
index 0000000..ea29d2b
--- /dev/null
+++ b/ifn-competence.yml
@@ -0,0 +1,40 @@
+spring:
+  application:
+    name: ifn-competence
+  jpa:
+    hibernate:
+      ddl-auto: none
+  kafka:
+    consumer:
+      group-id: ${spring.application.name}
+      auto-offset-reset: latest
+      enable-auto-commit: false
+    producer:
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: de.infinnit.commons.business.kafka.IfnJsonSerializer
+    listener:
+      ack-mode: MANUAL
+    properties:
+      isolation:
+        level: read_committed
+  datasource:
+    driverClassName: org.h2.Driver
+    # server mode
+    url: jdbc:h2:tcp://localhost:1521/ifn_competence;COMPRESS=TRUE;JMX=TRUE
+    username: sa
+    password:
+  main:
+    allow-bean-definition-overriding: true
+  liquibase:
+    enabled: true
+    change-log: classpath:/liquibase/master_test.xml
+
+server:
+  max-http-header-size: 16000
+  error:
+    path: /mvc-error
+
+management:
+  server:
+    servlet:
+      context-path: /actuator
diff --git a/ifn-correspondence.yml b/ifn-correspondence.yml
new file mode 100644
index 0000000..f7a16e6
--- /dev/null
+++ b/ifn-correspondence.yml
@@ -0,0 +1,40 @@
+spring:
+  application:
+    name: ifn-correspondence
+  jpa:
+    hibernate:
+      ddl-auto: none
+  kafka:
+    consumer:
+      group-id: ${spring.application.name}
+      auto-offset-reset: latest
+      enable-auto-commit: false
+    producer:
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: de.infinnit.commons.business.kafka.IfnJsonSerializer
+    listener:
+      ack-mode: MANUAL
+    properties:
+      isolation:
+        level: read_committed
+  datasource:
+    driverClassName: org.h2.Driver
+    # server mode
+    url: jdbc:h2:tcp://localhost:1521/ifn_corr;COMPRESS=TRUE;JMX=TRUE
+    username: sa
+    password:
+  main:
+    allow-bean-definition-overriding: true
+  liquibase:
+    enabled: true
+    change-log: classpath:/liquibase/master_test.xml
+
+server:
+  max-http-header-size: 16000
+  error:
+    path: /mvc-error
+
+management:
+  server:
+    servlet:
+      context-path: /actuator
diff --git a/ifn-feetable.yml b/ifn-feetable.yml
new file mode 100644
index 0000000..22f2c83
--- /dev/null
+++ b/ifn-feetable.yml
@@ -0,0 +1,53 @@
+spring:
+  application:
+    name: ifn-feetable
+  jpa:
+    hibernate:
+      ddl-auto: none
+      format_sql: true
+      use-new-id-generator-mappings: false
+    show-sql: false
+    properties:
+      org:
+        hibernate:
+          envers:
+            store_data_at_delete: true
+  kafka:
+    consumer:
+      group-id: ${spring.application.name}
+      auto-offset-reset: latest
+      enable-auto-commit: false
+    producer:
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: de.infinnit.commons.business.kafka.IfnJsonSerializer
+    listener:
+      ack-mode: MANUAL
+    properties:
+      isolation:
+        level: read_committed
+
+  datasource:
+    driverClassName: org.h2.Driver
+    # server mode
+    url: jdbc:h2:tcp://localhost:1521/ifn_ft;COMPRESS=TRUE;JMX=TRUE
+    username: sa
+    password:
+    main:
+      allow-bean-definition-overriding: true
+    liquibase:
+      enabled: true
+      change-log: classpath:/liquibase/master_test.xml
+
+  # New Changes after upgrade to 2.1.6
+  main:
+    allow-bean-definition-overriding: true
+
+server:
+  max-http-header-size: 16000
+  error:
+    path: /mvc-error
+
+management:
+  server:
+    servlet:
+      context-path: /actuator
\ No newline at end of file
diff --git a/ifn-integration.yml b/ifn-integration.yml
new file mode 100644
index 0000000..1bacf7d
--- /dev/null
+++ b/ifn-integration.yml
@@ -0,0 +1,62 @@
+# GLOBAL CONFIGURATION
+spring:
+  application:
+    name: ifn-integration
+  jpa:
+    hibernate:
+      ddl-auto: none
+  kafka:
+    consumer:
+      group-id: ${spring.application.name}
+      auto-offset-reset: latest
+      enable-auto-commit: false
+    producer:
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: de.infinnit.commons.business.kafka.IfnJsonSerializer
+    listener:
+      ack-mode: MANUAL
+    properties:
+      isolation:
+        level: read_committed
+      
+server:
+  max-http-header-size: 16000
+  error:
+    path: /mvc-error
+    
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 60000
+        readTimeout: 60000
+        error-decoder: de.infinnit.commons.business.error.payments.PaymentsErrorDecoder
+
+management:
+  server:
+    servlet:
+      context-path: /actuator
+    
+infinnit:
+  activateBusinessRequestDeleteAspect: false
+  activateBusinessRequestSaveAspect: false
+  integration:
+    payment:
+      scheduler-fixed-delay:
+        sctOutgoing: 900000
+        sctrOutgoing: 900000
+        sddOutgoing: 900000
+    sync:
+      scheduler-fixed-delay:
+        ibp-contract: 60000
+        partner: 60000
+        lc: 60000
+        lo: 60000
+        cov: 60000
+        dms-partner-relationship: 60000
+  roles: aut_admin,admin,user,aut_IFN-Integration-payments,trader,fund manager,sales,investment analyst,client adviser,risk manager,compliance officer,security and fraud specialist,operations analyst,business technology specialist
+
+ibs:
+  notification:
+    url: http://localhost/notExisting
+  roles: aut_admin,admin,config,user