diff --git a/account/src/main/resources/application-redis.yaml b/account/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/account/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/agreement/src/main/resources/application-redis.yaml b/agreement/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/agreement/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/agreement/src/main/resources/application.yaml b/agreement/src/main/resources/application.yaml
index c6263308..ca886b68 100644
--- a/agreement/src/main/resources/application.yaml
+++ b/agreement/src/main/resources/application.yaml
@@ -3,6 +3,13 @@ micronaut:
   server:
     port: 8632
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
   metrics:
     enabled: true
     export:
@@ -36,18 +43,4 @@ loggers:
 ---
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-  serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+  serverHost: http://localhost:8632
\ No newline at end of file
diff --git a/customer-bill-management/src/main/resources/application-redis.yaml b/customer-bill-management/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/customer-bill-management/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/customer-bill-management/src/main/resources/application.yaml b/customer-bill-management/src/main/resources/application.yaml
index c6263308..13c28469 100644
--- a/customer-bill-management/src/main/resources/application.yaml
+++ b/customer-bill-management/src/main/resources/application.yaml
@@ -3,6 +3,14 @@ micronaut:
   server:
     port: 8632
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
+
   metrics:
     enabled: true
     export:
@@ -36,18 +44,4 @@ loggers:
 ---
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-  serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+  serverHost: http://localhost:8632
\ No newline at end of file
diff --git a/customer-management/src/main/resources/application-redis.yaml b/customer-management/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/customer-management/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/customer-management/src/main/resources/application.yaml b/customer-management/src/main/resources/application.yaml
index b92ca3be..167db684 100644
--- a/customer-management/src/main/resources/application.yaml
+++ b/customer-management/src/main/resources/application.yaml
@@ -10,6 +10,13 @@ micronaut:
         step: PT2s
         descriptions: false
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
   http:
     services:
       read-timeout: 30s
@@ -35,18 +42,4 @@ loggers:
 ---
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-  serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+  serverHost: http://localhost:8632
\ No newline at end of file
diff --git a/party-catalog/src/main/resources/application-redis.yaml b/party-catalog/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/party-catalog/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/party-catalog/src/main/resources/application.yaml b/party-catalog/src/main/resources/application.yaml
index c6263308..27392049 100644
--- a/party-catalog/src/main/resources/application.yaml
+++ b/party-catalog/src/main/resources/application.yaml
@@ -10,6 +10,13 @@ micronaut:
         step: PT2s
         descriptions: false
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
   http:
     services:
       read-timeout: 30s
@@ -37,17 +44,3 @@ loggers:
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
   serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
diff --git a/pom.xml b/pom.xml
index 4928fe5e..150efb8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
         <version.io.kokuwa.micronaut.codegen>3.1.0</version.io.kokuwa.micronaut.codegen>
 
         <!-- mapping -->
-        <version.io.github.wistefan.ngsi-ld-mapping-java>0.4.1</version.io.github.wistefan.ngsi-ld-mapping-java>
+        <version.io.github.wistefan.ngsi-ld-mapping-java>0.5.0</version.io.github.wistefan.ngsi-ld-mapping-java>
 
         <!-- caching -->
         <version.io.micronaut.redis.micronaut-redis-lettuce>5.4.0</version.io.micronaut.redis.micronaut-redis-lettuce>
diff --git a/product-catalog/src/main/resources/application-redis.yaml b/product-catalog/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/product-catalog/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/product-catalog/src/main/resources/application.yaml b/product-catalog/src/main/resources/application.yaml
index c6263308..587936d4 100644
--- a/product-catalog/src/main/resources/application.yaml
+++ b/product-catalog/src/main/resources/application.yaml
@@ -10,6 +10,13 @@ micronaut:
         step: PT2s
         descriptions: false
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
   http:
     services:
       read-timeout: 30s
@@ -36,18 +43,4 @@ loggers:
 ---
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-  serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+  serverHost: http://localhost:8632
\ No newline at end of file
diff --git a/product-inventory/src/main/resources/application-redis.yaml b/product-inventory/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/product-inventory/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/product-inventory/src/main/resources/application.yaml b/product-inventory/src/main/resources/application.yaml
index c6263308..587936d4 100644
--- a/product-inventory/src/main/resources/application.yaml
+++ b/product-inventory/src/main/resources/application.yaml
@@ -10,6 +10,13 @@ micronaut:
         step: PT2s
         descriptions: false
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
   http:
     services:
       read-timeout: 30s
@@ -36,18 +43,4 @@ loggers:
 ---
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-  serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+  serverHost: http://localhost:8632
\ No newline at end of file
diff --git a/product-ordering-management/src/main/resources/application-redis.yaml b/product-ordering-management/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/product-ordering-management/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/product-ordering-management/src/main/resources/application.yaml b/product-ordering-management/src/main/resources/application.yaml
index c6263308..587936d4 100644
--- a/product-ordering-management/src/main/resources/application.yaml
+++ b/product-ordering-management/src/main/resources/application.yaml
@@ -10,6 +10,13 @@ micronaut:
         step: PT2s
         descriptions: false
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
   http:
     services:
       read-timeout: 30s
@@ -36,18 +43,4 @@ loggers:
 ---
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-  serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+  serverHost: http://localhost:8632
\ No newline at end of file
diff --git a/resource-catalog/src/main/resources/application-redis.yaml b/resource-catalog/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/resource-catalog/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/resource-catalog/src/main/resources/application.yaml b/resource-catalog/src/main/resources/application.yaml
index eeb1580a..587936d4 100644
--- a/resource-catalog/src/main/resources/application.yaml
+++ b/resource-catalog/src/main/resources/application.yaml
@@ -10,6 +10,13 @@ micronaut:
         step: PT2s
         descriptions: false
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
   http:
     services:
       read-timeout: 30s
@@ -36,18 +43,4 @@ loggers:
 ---
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-  serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
+  serverHost: http://localhost:8632
\ No newline at end of file
diff --git a/resource-function-activation/src/main/resources/application-orion-ld.yaml b/resource-function-activation/src/main/resources/application-orion-ld.yaml
new file mode 100644
index 00000000..367ab0b7
--- /dev/null
+++ b/resource-function-activation/src/main/resources/application-orion-ld.yaml
@@ -0,0 +1,4 @@
+general:
+  ngsildOrQueryValue: ";"
+  ngsildOrQueryKey: ";"
+  encloseQuery: true
\ No newline at end of file
diff --git a/resource-function-activation/src/main/resources/application-redis.yaml b/resource-function-activation/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/resource-function-activation/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/resource-function-activation/src/main/resources/application-scorpio.yaml b/resource-function-activation/src/main/resources/application-scorpio.yaml
new file mode 100644
index 00000000..b8947264
--- /dev/null
+++ b/resource-function-activation/src/main/resources/application-scorpio.yaml
@@ -0,0 +1,4 @@
+general:
+  ngsildOrQueryValue: ","
+  ngsildOrQueryKey: ","
+  encloseQuery: false
\ No newline at end of file
diff --git a/resource-function-activation/src/main/resources/application.yaml b/resource-function-activation/src/main/resources/application.yaml
index c6263308..27392049 100644
--- a/resource-function-activation/src/main/resources/application.yaml
+++ b/resource-function-activation/src/main/resources/application.yaml
@@ -10,6 +10,13 @@ micronaut:
         step: PT2s
         descriptions: false
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
   http:
     services:
       read-timeout: 30s
@@ -37,17 +44,3 @@ loggers:
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
   serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
diff --git a/resource-inventory/src/main/resources/application-orion-ld.yaml b/resource-inventory/src/main/resources/application-orion-ld.yaml
new file mode 100644
index 00000000..367ab0b7
--- /dev/null
+++ b/resource-inventory/src/main/resources/application-orion-ld.yaml
@@ -0,0 +1,4 @@
+general:
+  ngsildOrQueryValue: ";"
+  ngsildOrQueryKey: ";"
+  encloseQuery: true
\ No newline at end of file
diff --git a/resource-inventory/src/main/resources/application-redis.yaml b/resource-inventory/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/resource-inventory/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/resource-inventory/src/main/resources/application-scorpio.yaml b/resource-inventory/src/main/resources/application-scorpio.yaml
new file mode 100644
index 00000000..b8947264
--- /dev/null
+++ b/resource-inventory/src/main/resources/application-scorpio.yaml
@@ -0,0 +1,4 @@
+general:
+  ngsildOrQueryValue: ","
+  ngsildOrQueryKey: ","
+  encloseQuery: false
\ No newline at end of file
diff --git a/resource-inventory/src/main/resources/application.yaml b/resource-inventory/src/main/resources/application.yaml
index eeb1580a..587936d4 100644
--- a/resource-inventory/src/main/resources/application.yaml
+++ b/resource-inventory/src/main/resources/application.yaml
@@ -10,6 +10,13 @@ micronaut:
         step: PT2s
         descriptions: false
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
   http:
     services:
       read-timeout: 30s
@@ -36,18 +43,4 @@ loggers:
 ---
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-  serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
+  serverHost: http://localhost:8632
\ No newline at end of file
diff --git a/service-catalog/src/main/resources/application-redis.yaml b/service-catalog/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/service-catalog/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file
diff --git a/service-catalog/src/main/resources/application.yaml b/service-catalog/src/main/resources/application.yaml
index c6263308..587936d4 100644
--- a/service-catalog/src/main/resources/application.yaml
+++ b/service-catalog/src/main/resources/application.yaml
@@ -10,6 +10,13 @@ micronaut:
         step: PT2s
         descriptions: false
 
+  caches:
+    entities:
+      maximumSize: 1000
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+
   http:
     services:
       read-timeout: 30s
@@ -36,18 +43,4 @@ loggers:
 ---
 general:
   contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld
-  serverHost: http://localhost:8632
-  
----
-redis:
-  uri: redis://localhost:6379
-  caches:
-    entities:
-      # enough to not call twice in one call, but would prevent conflicting writes
-      expire-after-write: 2s
-      expire-after-access: 2s
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
-    subscriptions:
-      expire-after-write: 14d
-      expire-after-access: 14d
-      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+  serverHost: http://localhost:8632
\ No newline at end of file
diff --git a/usage-management/src/main/resources/application-redis.yaml b/usage-management/src/main/resources/application-redis.yaml
new file mode 100644
index 00000000..3aebfb0d
--- /dev/null
+++ b/usage-management/src/main/resources/application-redis.yaml
@@ -0,0 +1,12 @@
+redis:
+  uri: redis://localhost:6379
+  caches:
+    entities:
+      # enough to not call twice in one call, but would prevent conflicting writes
+      expire-after-write: 2s
+      expire-after-access: 2s
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
+    subscriptions:
+      expire-after-write: 14d
+      expire-after-access: 14d
+      value-serializer: io.github.wistefan.mapping.EntityVOSerializer
\ No newline at end of file