diff --git a/.docs/.swagger/api.yaml b/.docs/.swagger/api.yaml
index 132f481c0eae4140a73eecfc053766ea3d7d6478..d4ebb776a4b16668de067d83fa2b3f0df7275044 100644
--- a/.docs/.swagger/api.yaml
+++ b/.docs/.swagger/api.yaml
@@ -3047,6 +3047,38 @@ paths:
         - bearerAuth: []
         - basicAuth: []
   '/api/database/{databaseId}/image':
+    get:
+      tags:
+        - database-endpoint
+      summary: Get database preview image
+      description: Gets the database with id on the preview image.
+      operationId: findPreviewImage
+      parameters:
+        - name: databaseId
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '200':
+          description: View of image was successful
+          content:
+            '*/*':
+              schema:
+                type: array
+                items:
+                  type: string
+                  format: byte
+        '404':
+          description: Database or user could not be found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ApiErrorDto'
+      security:
+        - bearerAuth: []
+        - basicAuth: []
     put:
       tags:
         - database-endpoint
@@ -6190,11 +6222,6 @@ components:
           $ref: '#/components/schemas/UserDto'
         owner:
           $ref: '#/components/schemas/UserDto'
-        image:
-          type: array
-          items:
-            type: string
-            format: byte
         created:
           type: string
           format: date-time
@@ -6211,6 +6238,8 @@ components:
         is_public:
           type: boolean
           example: true
+        preview_image:
+          type: string
     ForeignKeyBriefDto:
       type: object
       properties:
@@ -8499,14 +8528,14 @@ components:
           type: string
         resumptionToken:
           type: string
+        parametersString:
+          type: string
         fromDate:
           type: string
           format: date-time
         untilDate:
           type: string
           format: date-time
-        parametersString:
-          type: string
     BannerMessageDto:
       required:
         - id
@@ -8837,12 +8866,12 @@ components:
           type: string
         identifier:
           $ref: '#/components/schemas/Identifier'
+        apaName:
+          type: string
         bibtexName:
           type: string
         ieeeName:
           type: string
-        apaName:
-          type: string
     DataType:
       type: object
       properties:
diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock
index 8ee832e9149f66f1e763e16d54336d914e42af7f..8e7bafd4267885b6d55789c1c8a07a85c167a58b 100644
--- a/dbrepo-analyse-service/Pipfile.lock
+++ b/dbrepo-analyse-service/Pipfile.lock
@@ -175,20 +175,20 @@
         },
         "boto3": {
             "hashes": [
-                "sha256:473438feafe77d29fbea532a91a65de0d8751a4fa5822127218710a205e28e7a",
-                "sha256:ccb1a365d3084de53b58f8dfc056462f49b16931c139f4c8ac5f0bca8cb8fe81"
+                "sha256:88370c6845ba71a4dae7f6b357099df29b3965da584be040c8e72c9902bc9492",
+                "sha256:dab5bddbbe57dc707b6f6a1f25dc2823b8e234b6fe99fafef7fc406ab73031b9"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==1.35.73"
+            "version": "==1.35.74"
         },
         "botocore": {
             "hashes": [
-                "sha256:8a6a0f5ad119e38d850571df8c625dbad66aec1b20c15f84cdcb95258f9f1edb",
-                "sha256:b2e3ecdd1769f011f72c4c0d0094570ba125f4ca327f24269e4d68eb5d9878b9"
+                "sha256:9ac9d33d84dd9f05b35085de081552342a2c9ae22e3c4ee105723c9e92c07bd9",
+                "sha256:de5c4fa9a24cef3a758974857b5c5820a12fad345ebf33c052a5988e88f33634"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==1.35.73"
+            "version": "==1.35.74"
         },
         "certifi": {
             "hashes": [
@@ -427,7 +427,7 @@
         },
         "dbrepo": {
             "hashes": [
-                "sha256:bd3ff15aa9cbf1300f638d58b22354e49c71b730934ff79fccc4afc532a761aa"
+                "sha256:292c2631816ca3dbdbd243e4c006c4bd39d512f5ae7e4b10070102c85ec58a10"
             ],
             "path": "./lib/dbrepo-1.5.2.tar.gz"
         },
@@ -1095,11 +1095,11 @@
         },
         "prometheus-client": {
             "hashes": [
-                "sha256:4fa6b4dd0ac16d58bb587c04b1caae65b8c5043e85f778f42f5f632f6af2e166",
-                "sha256:96c83c606b71ff2b0a433c98889d275f51ffec6c5e267de37c7a2b5c9aa9233e"
+                "sha256:252505a722ac04b0456be05c05f75f45d760c2911ffc45f2a06bcaed9f3ae3fb",
+                "sha256:594b45c410d6f4f8888940fe80b5cc2521b305a1fafe1c58609ef715a001f301"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.21.0"
+            "version": "==0.21.1"
         },
         "prometheus-flask-exporter": {
             "hashes": [
@@ -1245,12 +1245,12 @@
         },
         "pydantic": {
             "hashes": [
-                "sha256:2bc2d7f17232e0841cbba4641e65ba1eb6fafb3a08de3a091ff3ce14a197c4fa",
-                "sha256:cfb96e45951117c3024e6b67b25cdc33a3cb7b2fa62e239f7af1378358a1d99e"
+                "sha256:be04d85bbc7b65651c5f8e6b9976ed9c6f41782a55524cef079a34a0bb82144d",
+                "sha256:cb5ac360ce894ceacd69c403187900a02c4b20b693a9dd1d643e1effab9eadf9"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8'",
-            "version": "==2.10.2"
+            "version": "==2.10.3"
         },
         "pydantic-core": {
             "hashes": [
@@ -1459,110 +1459,112 @@
         },
         "rpds-py": {
             "hashes": [
-                "sha256:034964ea0ea09645bdde13038b38abb14be0aa747f20fcfab6181207dd9e0483",
-                "sha256:0686f2c16eafdc2c6b4ce6e86e5b3092e87db09ae64be2787616444eb35b9756",
-                "sha256:0903ffdb5b9007e503203b6285e4ff0faf96d875c19f1d103b475acf7d9f7311",
-                "sha256:1212cb231f2002934cd8d71a0d718fdd9d9a2dd671e0feef8501038df3508026",
-                "sha256:1357c3092702078b7782b6ebd5ba9b22c1a291c34fbf9d8f1a48237466ac7758",
-                "sha256:1a6cc4eb1e86364331928acafb2bb41d8ab735ca3caf2d6019b9f6dac3f4f65d",
-                "sha256:208ce1d8e3af138d1d9b21d7206356b7f29b96675e0113aea652cf024e4ddfdc",
-                "sha256:2498ff422823be087b48bc82710deb87ac34f6b7c8034ee39920647647de1e60",
-                "sha256:24c28df05bd284879d0fac850ba697077d2a33b7ebcaea6318d6b6cdfdc86ddc",
-                "sha256:2a57300cc8b034c5707085249efd09f19116bb80278d0ec925d7f3710165c510",
-                "sha256:2d2fc3ab021be3e0b5aec6d4164f2689d231b8bfc5185cc454314746aa4aee72",
-                "sha256:2f513758e7cda8bc262e80299a8e3395d7ef7f4ae705be62632f229bc6c33208",
-                "sha256:306da3dfa174b489a3fc63b0872e2226a5ddf94c59875a770d72aff945d5ed96",
-                "sha256:326e42f2b49462e05f8527a1311ce98f9f97c484b3e443ec0ea4638bed3aebcf",
-                "sha256:32a0e24cab2daae0503b06666d516e90a080c1a95aff0406b9f03c6489177c4b",
-                "sha256:32de71c393f126d8203e9815557c7ff4d72ed1ad3aa3f52f6c7938413176750a",
-                "sha256:341a07a4b55126bfae68c9bf24220a73d456111e5eb3dcbdab9fd16de2341224",
-                "sha256:38cacf1f378571450576f2c8ce87da6f3fddc59d744de5c12b37acc23285b1e1",
-                "sha256:3b94b074dcce39976db22ea75c7aea8b22d95e6d3b62f76e20e1179a278521d8",
-                "sha256:3dc7c64b56b82428894f056e9ff6e8ee917ff74fc26b65211a33602c2372e928",
-                "sha256:3f7a048ec1ebc991331d709be4884dc318c9eaafa66dcde8be0933ac0e702149",
-                "sha256:41f65a97bf2c4b161c9f8f89bc37058346bec9b36e373c8ad00a16c957bff625",
-                "sha256:48c95997af9314f4034fe5ba2d837399e786586e220835a578d28fe8161e6ae5",
-                "sha256:49e084d47a66027ac72844f9f52f13d347a9a1f05d4f84381b420e47f836a7fd",
-                "sha256:4b5d17d8f5b885ce50e0cda85f99c0719e365e98b587338535fa566a48375afb",
-                "sha256:4c0321bc03a1c513eca1837e3bba948b975bcf3a172aebc197ab3573207f137a",
-                "sha256:4e7c9aa2353eb0b0d845323857197daa036c2ff8624df990b0d886d22a8f665e",
-                "sha256:4fc4824e38c1e91a73bc820e7caacaf19d0acd557465aceef0420ca59489b390",
-                "sha256:54d8f94dec5765a9edc19610fecf0fdf9cab36cbb9def1213188215f735a6f98",
-                "sha256:574c5c94213bc9990805bfd7e4ba3826d3c098516cbc19f0d0ef0433ad93fa06",
-                "sha256:59e63da174ff287db05ef7c21d75974a5bac727ed60452aeb3a14278477842a8",
-                "sha256:5ae7927cd2b869ca4dc645169d8af5494a29c99afd0ea0f24dd00c811ab1d8b8",
-                "sha256:5f21e1278c9456cd601832375c778ca44614d3433996488221a56572c223f04a",
-                "sha256:5fdf91a7c07f40e47b193f2acae0ed9da35d09325d7c3c3279f722b7cbf3d264",
-                "sha256:62ab12fe03ffc49978d29de9c31bbb216610157f7e5ca8e172fed6642aead3be",
-                "sha256:632d2fdddd9fbe3ac8896a119fd18a71fc95ca9c4cbe5223096c142d8c4a2b1d",
-                "sha256:64a0c965a1e299c9b280006bdb15c276c427c45360aed676305dc36bcaa4d13c",
-                "sha256:67e013a17a3db4d98cc228fd5aeb36a51b0f5cf7330b9102a552060f1fe4e560",
-                "sha256:6b639a19e1791b646d27f15d17530a51722cc728d43b2dff3aeb904f92d91bac",
-                "sha256:6b6e4bcfc32f831bfe3d6d8a5acedfbfd5e252a03c83fa24813b277a3a8a13ca",
-                "sha256:7539dbb8f705e13629ba6f23388976aad809e387f32a6e5c0712e4e8d9bfcce7",
-                "sha256:758098b38c344d9a7f279baf0689261777e601f620078ef5afdc9bd3339965c3",
-                "sha256:762206ba3bf1d6c8c9e0055871d3c0d5b074b7c3120193e6c067e7866f106ab1",
-                "sha256:771c9a3851beaa617d8c8115d65f834a2b52490f42ee2b88b13f1fc5529e9e0c",
-                "sha256:81e7a27365b02fe70a77f1365376879917235b3fec551d19b4c91b51d0bc1d07",
-                "sha256:8338db3c76833d02dc21c3e2c42534091341d26e4f7ba32c6032bb558a02e07b",
-                "sha256:8426f97117b914b9bfb2a7bd46edc148e8defda728a55a5df3a564abe70cd7a4",
-                "sha256:842855bbb113a19c393c6de5aa6ed9a26c6b13c2fead5e49114d39f0d08b94d8",
-                "sha256:87453d491369cd8018016d2714a13e8461975161703c18ee31eecf087a8ae5d4",
-                "sha256:875fe8dffb43c20f68379ee098b035a7038d7903c795d46715f66575a7050b19",
-                "sha256:8ad4dfda52e64af3202ceb2143a62deba97894b71c64a4405ee80f6b3ea77285",
-                "sha256:8c48fc7458fe3a74dcdf56ba3534ff41bd421f69436df09ff3497fdaac18b431",
-                "sha256:8cbb040fec8eddd5a6a75e737fd73c9ce37e51f94bacdd0b178d0174a4758395",
-                "sha256:92d28a608127b357da47c99e0d0e0655ca2060286540fe9f2a25a2e8ac666e05",
-                "sha256:931bf3d0705b2834fed29354f35170fa022fe22a95542b61b7c66aca5f8a224f",
-                "sha256:93bbd66f46dddc41e8c656130c97c0fb515e0fa44e1eebb2592769dbbd41b2f5",
-                "sha256:9ad4640a409bc2b7d22b7921e7660f0db96c5c8c69fbb2e8f3261d4f71d33983",
-                "sha256:a4366f264fa60d3c109f0b27af0cd9eb8d46746bd70bd3d9d425f035b6c7e286",
-                "sha256:a73ed43d64209e853bba567a543170267a5cd64f359540b0ca2d597e329ba172",
-                "sha256:a810a57ce5e8ecf8eac6ec4dab534ff80c34e5a2c31db60e992009cd20f58e0f",
-                "sha256:b4660943030406aaa40ec9f51960dd88049903d9536bc3c8ebb5cc4e1f119bbe",
-                "sha256:b8906f537978da3f7f0bd1ba37b69f6a877bb43312023b086582707d2835bf2f",
-                "sha256:b91bfef5daa2a5a4fe62f8d317fc91a626073639f951f851bd2cb252d01bc6c5",
-                "sha256:ba1fc34d0b2f6fd53377a4c954116251eba6d076bf64f903311f4a7d27d10acd",
-                "sha256:ba235e00e0878ba1080b0f2a761f143b2a2d1c354f3d8e507fbf2f3de401bf18",
-                "sha256:bb11809b0de643a292a82f728c494a2bbef0e30a7c42d37464abbd6bef7ca7b1",
-                "sha256:c17b43fe9c6da16885e3fe28922bcd1a029e61631fb771c7d501019b40bcc904",
-                "sha256:c1c21030ed494deb10226f90e2dbd84a012d59810c409832714a3dd576527be2",
-                "sha256:c398a5a8e258dfdc5ea2aa4e5aa2ca3207f654a8eb268693dd1a76939074a588",
-                "sha256:c637188b930175c256f13adbfc427b83ec7e64476d1ec9d6608f312bb84e06c3",
-                "sha256:c7b4450093c0c909299770226fb0285be47b0a57545bae25b5c4e51566b0e587",
-                "sha256:c8fd7a16f7a047e06c747cfcf2acef3ac316132df1c6077445b29ee6f3f3a70b",
-                "sha256:ca505fd3767a09a139737f3278bc8a485cb64043062da89bcba27e2f2ea78d33",
-                "sha256:d1522025cda9e57329aade769f56e5793b2a5da7759a21914ee10e67e17e601e",
-                "sha256:d276280649305c1da6cdd84585d48ae1f0efa67434d8b10d2df95228e59a05bb",
-                "sha256:d33622dc63c295788eed09dbb1d11bed178909d3267b02d873116ee6be368244",
-                "sha256:d4f2af3107fe4dc40c0d1a2409863f5249c6796398a1d83c1d99a0b3fa6cfb8d",
-                "sha256:d5469b347445d1c31105f33e7bfc9a8ba213d48e42641a610dda65bf9e3c83f5",
-                "sha256:d80fd710b3307a3c63809048b72c536689b9b0b31a2518339c3f1a4d29c73d7a",
-                "sha256:d9bb9242b38a664f307b3b897f093896f7ed51ef4fe25a0502e5a368de9151ea",
-                "sha256:d9ceca96df54cb1675a0b7f52f1c6d5d1df62c5b40741ba211780f1b05a282a2",
-                "sha256:dc2c00acdf68f1f69a476b770af311a7dc3955b7de228b04a40bcc51ac4d743b",
-                "sha256:dfdabdf8519c93908b2bf0f87c3f86f9e88bab279fb4acfd0907519ca5a1739f",
-                "sha256:e04919ffa9a728c446b27b6b625fa1d00ece221bdb9d633e978a7e0353a12c0e",
-                "sha256:e0abcce5e874474d3eab5ad53be03dae2abe651d248bdeaabe83708e82969e78",
-                "sha256:e1c04fb380bc8efaae2fdf17ed6cd5d223da78a8b0b18a610f53d4c5d6e31dfd",
-                "sha256:e23dcdd4b2ff9c6b3317ea7921b210d39592f8ca1cdea58ada25b202c65c0a69",
-                "sha256:e34a3e665d38d0749072e6565400c8ce9abae976e338919a0dfbfb0e1ba43068",
-                "sha256:e6da2e0500742e0f157f005924a0589f2e2dcbfdd6cd0cc0abce367433e989be",
-                "sha256:e9aa4af6b879bb75a3c7766fbf49d77f4097dd12b548ecbbd8b3f85caa833281",
-                "sha256:e9bbdba9e75b1a9ee1dd1335034dad998ef1acc08492226c6fd50aa773bdfa7d",
-                "sha256:e9d4293b21c69ee4f9e1a99ac4f772951d345611c614a0cfae2ec6b565279bc9",
-                "sha256:eadd2417e83a77ce3ae4a0efd08cb0ebdfd317b6406d11020354a53ad458ec84",
-                "sha256:ed0102146574e5e9f079b2e1a06e6b5b12a691f9c74a65b93b7f3d4feda566c6",
-                "sha256:f0fb8efc9e579acf1e556fd86277fecec320c21ca9b5d39db96433ad8c45bc4a",
-                "sha256:f4e9946c8c7def17e4fcb5eddb14c4eb6ebc7f6f309075e6c8d23b133c104607",
-                "sha256:f7649c8b8e4bd1ccc5fcbd51a855d57a617deeba19c66e3d04b1abecc61036b2",
-                "sha256:f980a0640599a74f27fd9d50c84c293f1cb7afc2046c5c6d3efaf8ec7cdbc326",
-                "sha256:f9dc2113e0cf0dd637751ca736186fca63664939ceb9f9f67e93ade88c69c0c9",
-                "sha256:fde778947304e55fc732bc8ea5c6063e74244ac1808471cb498983a210aaf62c",
-                "sha256:fe23687924b25a2dee52fab15976fd6577ed8518072bcda9ff2e2b88ab1f168b"
+                "sha256:0545928bdf53dfdfcab284468212efefb8a6608ca3b6910c7fb2e5ed8bdc2dc0",
+                "sha256:05fdeae9010533e47715c37df83264df0122584e40d691d50cf3607c060952a3",
+                "sha256:09a1f000c5f6e08b298275bae00921e9fbbf2a35dae0a86db2821c058c2201a9",
+                "sha256:0a53592cdf98cec3dfcdb24ffec8a4797e7656b65700099af43ec7df023b6de4",
+                "sha256:0f057a0c546c42964836b209d8de9ea1a4f4b0432006c6343cbe633d8ca14571",
+                "sha256:0f9eb37d3a60b262a98ab51ee899cac039de9ca0ce68dcf1a6518a09719020b0",
+                "sha256:102be79c4cc47a4aeb5912401185c404cd2601c15a7163bbecff7f1bfe20b669",
+                "sha256:128cbaed7ba26116820bcb992405d6a13ea18c8fca1b8c4f59906d858e91e979",
+                "sha256:149b4d875ef9b12a8f5e303e86a32a58f8ef627e57ec97a7d0e4be819069d141",
+                "sha256:153248f48d6f90a295a502f53ec544a3ffbd21b0bb32f5dca39c4b93a764d6a2",
+                "sha256:157a023bded0618a1eea54979fe2e0f9309e9ddc818ef4b8fc3b884ff38fedd5",
+                "sha256:15fa4ca658f8ad22645d3531682b17e5580832efbfa87304c3e62214c79c1e8a",
+                "sha256:198067aa6f3d942ff5d0d655bb1e91b59ae85279d47590682cba2834ac1b97d2",
+                "sha256:1c40e02cc4f3e18fd39344edb10eebe04bd11cfd13119606b5771e5ea51630d3",
+                "sha256:1ded65691a1d3fd7d2aa89d2c91aa51f941601bb2ce099739909034d957fef4b",
+                "sha256:201650b309c419143775c15209c620627de3c09a27c7fb58375325aec5cce260",
+                "sha256:2143c3aed85992604d758bbe67da839fb4aab3dd2e1c6dddab5b3ca7162b34a2",
+                "sha256:2177e59c033bf0d1bf7de1ced561205963583caf3242c6c700a723034bfb5f8e",
+                "sha256:2ea23f1525d4f64286dbe0947c929d45c3ffe963b2dbed1d3844a2e4938bda42",
+                "sha256:31264187fc934ff1024a4f56775f33c9252d3f4f3e27ec07d1995a26b52702c3",
+                "sha256:36ce951800ed2acc6772fd9f42150f29d567f0423989748052fdb39d9e2b5795",
+                "sha256:3aaa22487477de9618ce3b37f99fbe81219ba96f3c2ca84f576f0ab451b83aba",
+                "sha256:3e7e99e2af59c56c59b6c964d612511b8203480d39d1ef83edc56f2cb42a3f5d",
+                "sha256:413a30a99d8683dace3765885920ed27ab662efbb6c98d81db76c397ad1ffd71",
+                "sha256:447ae1104fb32197b9262f772d565d38e834cc2e9edd89350b37b88fed636e70",
+                "sha256:4659b2e4a5008715099e216050f5c6976e5a4329482664411789968b82e3f17d",
+                "sha256:48ee97c7c6027fd423058675b5a39d0b5f7a1648250b671563d5c9f74ff13ff0",
+                "sha256:4ba6c66fbc6015b2f99e7176fec41793cecb00c4cc357cad038dff85e6ac42ab",
+                "sha256:4c8dc7331e8cbb1c0ea2bcb550adb1777365944ffd125c69aa1117fdef4887f5",
+                "sha256:50e4b5d291105f7063259fe0125b1af902fb34499444d7c5c521dd8328b00939",
+                "sha256:542eb246d5be31b5e0a9c8ddb9539416f9b31f58f75bd4ee328bff2b5c58d6fd",
+                "sha256:55d371b9d8b0c2a68a50413a8cb01c3c3ce1ea4f768bf77b66669a9a486e101e",
+                "sha256:580ccbf11f02f948add4cb641843030a89f1463d7c0740cbfc9aca91e9dc34b3",
+                "sha256:5dbff9402c2bdf00bf0df9905694b3c292a3847c725651938a72f554351a5fcb",
+                "sha256:5f941fb86195f97be7f6efe04a21b223f05dfe4d1dfb159999e2f8d101e44cc4",
+                "sha256:608c84699b2db09c6a8743845b1a3dad36fae53eaaecb241d45b13dff74405fb",
+                "sha256:626b9feb01bff049a5aec4804f0c58db12585778b4902e5376a95b01f80a7a16",
+                "sha256:66f4f48a89cdd30ab3a47335df81c76e9a63799d0d84b29c0618371c66fa37b0",
+                "sha256:6c8e97e19aa7b0b0d801a159f932ce4435f1049c8c38e2bb372bb5bee559ce50",
+                "sha256:72407065ad459db9f3d052ea8c51e02534f02533fc61e51cbab3bd94166f086c",
+                "sha256:734783dd7da58f76222f458346ddebdb3621686a1a2a667db5049caf0c9956b9",
+                "sha256:76eaa4c087a061a2c8a0a92536405069878a8f530c00e84a9eaf332e70f5561f",
+                "sha256:776a06cb5720556a549829896a49acebb5bdd96c7bba100191a994053546975a",
+                "sha256:7839b7528faa4d134c183b1f2dd1ee4dc2ca2f899f4f0cfdf00fc04c255262a7",
+                "sha256:8080467df22feca0fc9c46567001777c6fbc2b4a2683a7137420896051874ca1",
+                "sha256:85060e96953647871957d41707adb8d7bff4e977042fd0deb4fc1881b98dd2fe",
+                "sha256:8954b9ffe60f479a0c0ba40987db2546c735ab02a725ea7fd89342152d4d821d",
+                "sha256:8a603155db408f773637f9e3a712c6e3cbc521aaa8fa2b99f9ba6106c59a2496",
+                "sha256:8bd9ec1db79a664f4cbb12878693b73416f4d2cb425d3e27eccc1bdfbdc826ef",
+                "sha256:8c0c324879d483504b07f7b18eb1b50567c434263bbe4866ecce33056162668a",
+                "sha256:8ce729f1dc8a4a190c34b69f75377bddc004079b2963ab722ab91fafe040be6d",
+                "sha256:8ec41049c90d204a6561238a9ad6c7263ebb7009d9759c98b58078d9d2fec9ba",
+                "sha256:959ae04ed30cde606f3a0320f0a1f4167a107e685ef5209cce28c5080590bd31",
+                "sha256:96559e05bdf938b2048353e10a7920b98f853cefe4482c2064a718d7d0a50bd7",
+                "sha256:96b3759d8ab2323324e0a92b2f44834f9d88089b8d1ab6f533b61f4be3411cef",
+                "sha256:97c5ffe47ccf92d8b17e10f8a5ce28d015aa1196edc3359684cf31504eae6a14",
+                "sha256:9d5b925156a746dc1f5f52376fdd1fbdd3f6ffe1fcd6f5e06f77ca79abb940a3",
+                "sha256:9dae4eb9b5534e09ba6c6ab496a757e5e394b7e7b08767d25ca37e8d36491114",
+                "sha256:a083221b6a4ecdef38a60c95d8d3223d99449cb4da2544e9644958dc16664eb9",
+                "sha256:a0ed14a4162c2c2b21a162c9fcf90057e3e7da18cd171ab344c1e1664f75090e",
+                "sha256:a18aedc032d6468b73ebbe4437129cb30d54fe543cde2f23671ecad76c3aea24",
+                "sha256:a451dba533be77454ebcffc85189108fc05f279100835ac76e7989edacb89156",
+                "sha256:aa2ba0176037c915d8660a4e46581d645e2c22b5373e466bc8640a794d45861a",
+                "sha256:ab27dd4edd84b13309f268ffcdfc07aef8339135ffab7b6d43f16884307a2a48",
+                "sha256:ab784621d3e2a41916e21f13a483602cc989fd45fff637634b9231ba43d4383b",
+                "sha256:b07fa9e634234e84096adfa4be3828c8f26e238679c122824b2b3d7131bec578",
+                "sha256:b09209cdfcacf5eba9cf80367130532e6c02e695252e1f64d3cfcc2356e6e19f",
+                "sha256:babec324e8654a59122aaa66936a9a483faa03276db9792f51332475c2dddc4a",
+                "sha256:bca4428c4a957b78ded3e6e62884ab03f029dce8fa8d34818da0f80f61332b49",
+                "sha256:c0467838c90435b80793cde486a318fc916ee57f2af54e4b10c72b20cbdcbaa9",
+                "sha256:c2a214bf5b79bd39a9de1c991353aaaacafda83ba1374178309e92be8e67d411",
+                "sha256:c3029f481b31f329b1fdb4ec4b56935d82210ddd9c6f86ea5a87c06f1e97b161",
+                "sha256:c6f3fd617db422c9d4e12cb8d84c984fe07d6d9cb0950cbf117f3bccc6268d05",
+                "sha256:c783e4ed68200f4e03c125690d23158b1c49c4b186d458a18debc109bbdc3c2e",
+                "sha256:c8502a02ae3ae67084f5a0bf5a8253b19fa7a887f824e41e016cdb0ac532a06f",
+                "sha256:c88535f83f7391cf3a45af990237e3939a6fdfbedaed2571633bfdd0bceb36b0",
+                "sha256:c9ce6b83597d45bec44a2690857ede62fc98223772135f8a7fa90884eb726501",
+                "sha256:ca4657e9fd0b1b5376942d403d634ce188f79064f0873aa853ab05b10185ceec",
+                "sha256:d0ff8d5b13ce2357fa8b33a0a2e3775aa71df5bf7c8ba060634c9d15ab12f357",
+                "sha256:d280b4bf09f719b89fd9aab3b71067acc0d0449b7d1eba99a2ade4939cef8296",
+                "sha256:d3777c446bb1c5fcd82dc3f8776e1a146cd91e80cc1892f8634575ace438d22f",
+                "sha256:d7833ef6f5d6cb634f296abfd93452fb3eb44c4e9a6ae95c1021eab704c1cee2",
+                "sha256:d8306f27418361b788e3fca9f47dec125457f80122e7e31ba7ff5cdba98343f8",
+                "sha256:d962e2e89b3a95e3597a34b8c93ced1e98958502c5b8096c9fd69deff279f561",
+                "sha256:dbe428d0ac6eacaf05402adbaf137f59ad6063848182d1ff294f95ce0f24005b",
+                "sha256:e4f91d702b9ce1388660b3d4a28aa552614a1399e93f718ed0dacd68f23b3d32",
+                "sha256:e69acdbc132c9592c8dc393af85e38e206ca847c7019a953ff625191c3a12312",
+                "sha256:e8056adcefa2dcb67e8bc91ea5eee26df66e8b297a8cd6ff0903f85c70908fa0",
+                "sha256:e9ac7280bd045f472b50306d7efeee051b69e3a2dd1b90f46bd7e86e63b1efa2",
+                "sha256:eb013aa01b404219f28dc973d9e6310fd4db216d7299253dd355629952e0564e",
+                "sha256:ec1ccc2a9f764cd632fb8ab28fdde166250df54fc8d97315a4a6948dc5367639",
+                "sha256:ef7282d8a14b60dd515e47060638687710b1d518f4b5e961caad43fb3a3606f9",
+                "sha256:ef92b1fbe6aa2e7885eb90853cc016b1fc95439a8cc8da6d526880e9e2148695",
+                "sha256:efb2ad60ca8637d5f9f653f9a9a8d73964059972b6b95036be77e028bffc68a3",
+                "sha256:effcae2152afe7937a28376dbabb25c770ef99ed4e16a4ffeb8e6a4f7c4f06aa",
+                "sha256:f2d1b58a0c3a73f0361759642e80260a6d28eee6501b40fe25b82af33ef83f21",
+                "sha256:f57e2d0f8022783426121b586d7c842ea40ea832a29e28ca36c881b54c74fb28",
+                "sha256:f5cae9b415ea8a6a563566dbf46650222eccc5971c7daa16fbee63aef92ae543",
+                "sha256:f76c6f319e57007ad52e671ec741d801324760a377e3d4992c9bb8200333ebac",
+                "sha256:f91bfc39f7a64168e08ab831fa497ec5438c1d6c6e2f9e12848d95ad11ac8523",
+                "sha256:fdaee3947eaaa52dae3ceb9d9f66329e13d8bae35682b1e5dd54612938693934",
+                "sha256:fe3f245c2f39a5692d9123c174bc48f6f9fe3e96407e67c6d04541a767d99e72",
+                "sha256:ffae97d28ea4f2c613a751d087b75a97fb78311b38cc2e9a2f4587e473ace167"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==0.22.0"
+            "version": "==0.22.1"
         },
         "s3transfer": {
             "hashes": [
@@ -1625,7 +1627,7 @@
                 "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
                 "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
             ],
-            "markers": "python_version >= '3.8'",
+            "markers": "python_version >= '3.10'",
             "version": "==2.2.3"
         },
         "werkzeug": {
@@ -2262,7 +2264,7 @@
                 "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
                 "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
             ],
-            "markers": "python_version >= '3.8'",
+            "markers": "python_version >= '3.10'",
             "version": "==2.2.3"
         },
         "wrapt": {
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.5.2.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.5.2.tar.gz
index d2dd0148cb1210d12778ba92bae329e092b96311..52bf0fe9a030ce509450bc52427eb7e2c1f1da13 100644
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.5.2.tar.gz and b/dbrepo-analyse-service/lib/dbrepo-1.5.2.tar.gz differ
diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock
index 9a5a51f7f8b5d8a9fd143fb855cc517225150588..9ccdcd7ec5ff19ad05b520e1a9665847497e0dc7 100644
--- a/dbrepo-search-service/Pipfile.lock
+++ b/dbrepo-search-service/Pipfile.lock
@@ -375,7 +375,7 @@
         },
         "dbrepo": {
             "hashes": [
-                "sha256:bd3ff15aa9cbf1300f638d58b22354e49c71b730934ff79fccc4afc532a761aa"
+                "sha256:292c2631816ca3dbdbd243e4c006c4bd39d512f5ae7e4b10070102c85ec58a10"
             ],
             "path": "./lib/dbrepo-1.5.2.tar.gz"
         },
@@ -1002,11 +1002,11 @@
         },
         "prometheus-client": {
             "hashes": [
-                "sha256:4fa6b4dd0ac16d58bb587c04b1caae65b8c5043e85f778f42f5f632f6af2e166",
-                "sha256:96c83c606b71ff2b0a433c98889d275f51ffec6c5e267de37c7a2b5c9aa9233e"
+                "sha256:252505a722ac04b0456be05c05f75f45d760c2911ffc45f2a06bcaed9f3ae3fb",
+                "sha256:594b45c410d6f4f8888940fe80b5cc2521b305a1fafe1c58609ef715a001f301"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==0.21.0"
+            "version": "==0.21.1"
         },
         "prometheus-flask-exporter": {
             "hashes": [
@@ -1114,11 +1114,11 @@
         },
         "pydantic": {
             "hashes": [
-                "sha256:2bc2d7f17232e0841cbba4641e65ba1eb6fafb3a08de3a091ff3ce14a197c4fa",
-                "sha256:cfb96e45951117c3024e6b67b25cdc33a3cb7b2fa62e239f7af1378358a1d99e"
+                "sha256:be04d85bbc7b65651c5f8e6b9976ed9c6f41782a55524cef079a34a0bb82144d",
+                "sha256:cb5ac360ce894ceacd69c403187900a02c4b20b693a9dd1d643e1effab9eadf9"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.10.2"
+            "version": "==2.10.3"
         },
         "pydantic-core": {
             "hashes": [
@@ -1361,110 +1361,112 @@
         },
         "rpds-py": {
             "hashes": [
-                "sha256:034964ea0ea09645bdde13038b38abb14be0aa747f20fcfab6181207dd9e0483",
-                "sha256:0686f2c16eafdc2c6b4ce6e86e5b3092e87db09ae64be2787616444eb35b9756",
-                "sha256:0903ffdb5b9007e503203b6285e4ff0faf96d875c19f1d103b475acf7d9f7311",
-                "sha256:1212cb231f2002934cd8d71a0d718fdd9d9a2dd671e0feef8501038df3508026",
-                "sha256:1357c3092702078b7782b6ebd5ba9b22c1a291c34fbf9d8f1a48237466ac7758",
-                "sha256:1a6cc4eb1e86364331928acafb2bb41d8ab735ca3caf2d6019b9f6dac3f4f65d",
-                "sha256:208ce1d8e3af138d1d9b21d7206356b7f29b96675e0113aea652cf024e4ddfdc",
-                "sha256:2498ff422823be087b48bc82710deb87ac34f6b7c8034ee39920647647de1e60",
-                "sha256:24c28df05bd284879d0fac850ba697077d2a33b7ebcaea6318d6b6cdfdc86ddc",
-                "sha256:2a57300cc8b034c5707085249efd09f19116bb80278d0ec925d7f3710165c510",
-                "sha256:2d2fc3ab021be3e0b5aec6d4164f2689d231b8bfc5185cc454314746aa4aee72",
-                "sha256:2f513758e7cda8bc262e80299a8e3395d7ef7f4ae705be62632f229bc6c33208",
-                "sha256:306da3dfa174b489a3fc63b0872e2226a5ddf94c59875a770d72aff945d5ed96",
-                "sha256:326e42f2b49462e05f8527a1311ce98f9f97c484b3e443ec0ea4638bed3aebcf",
-                "sha256:32a0e24cab2daae0503b06666d516e90a080c1a95aff0406b9f03c6489177c4b",
-                "sha256:32de71c393f126d8203e9815557c7ff4d72ed1ad3aa3f52f6c7938413176750a",
-                "sha256:341a07a4b55126bfae68c9bf24220a73d456111e5eb3dcbdab9fd16de2341224",
-                "sha256:38cacf1f378571450576f2c8ce87da6f3fddc59d744de5c12b37acc23285b1e1",
-                "sha256:3b94b074dcce39976db22ea75c7aea8b22d95e6d3b62f76e20e1179a278521d8",
-                "sha256:3dc7c64b56b82428894f056e9ff6e8ee917ff74fc26b65211a33602c2372e928",
-                "sha256:3f7a048ec1ebc991331d709be4884dc318c9eaafa66dcde8be0933ac0e702149",
-                "sha256:41f65a97bf2c4b161c9f8f89bc37058346bec9b36e373c8ad00a16c957bff625",
-                "sha256:48c95997af9314f4034fe5ba2d837399e786586e220835a578d28fe8161e6ae5",
-                "sha256:49e084d47a66027ac72844f9f52f13d347a9a1f05d4f84381b420e47f836a7fd",
-                "sha256:4b5d17d8f5b885ce50e0cda85f99c0719e365e98b587338535fa566a48375afb",
-                "sha256:4c0321bc03a1c513eca1837e3bba948b975bcf3a172aebc197ab3573207f137a",
-                "sha256:4e7c9aa2353eb0b0d845323857197daa036c2ff8624df990b0d886d22a8f665e",
-                "sha256:4fc4824e38c1e91a73bc820e7caacaf19d0acd557465aceef0420ca59489b390",
-                "sha256:54d8f94dec5765a9edc19610fecf0fdf9cab36cbb9def1213188215f735a6f98",
-                "sha256:574c5c94213bc9990805bfd7e4ba3826d3c098516cbc19f0d0ef0433ad93fa06",
-                "sha256:59e63da174ff287db05ef7c21d75974a5bac727ed60452aeb3a14278477842a8",
-                "sha256:5ae7927cd2b869ca4dc645169d8af5494a29c99afd0ea0f24dd00c811ab1d8b8",
-                "sha256:5f21e1278c9456cd601832375c778ca44614d3433996488221a56572c223f04a",
-                "sha256:5fdf91a7c07f40e47b193f2acae0ed9da35d09325d7c3c3279f722b7cbf3d264",
-                "sha256:62ab12fe03ffc49978d29de9c31bbb216610157f7e5ca8e172fed6642aead3be",
-                "sha256:632d2fdddd9fbe3ac8896a119fd18a71fc95ca9c4cbe5223096c142d8c4a2b1d",
-                "sha256:64a0c965a1e299c9b280006bdb15c276c427c45360aed676305dc36bcaa4d13c",
-                "sha256:67e013a17a3db4d98cc228fd5aeb36a51b0f5cf7330b9102a552060f1fe4e560",
-                "sha256:6b639a19e1791b646d27f15d17530a51722cc728d43b2dff3aeb904f92d91bac",
-                "sha256:6b6e4bcfc32f831bfe3d6d8a5acedfbfd5e252a03c83fa24813b277a3a8a13ca",
-                "sha256:7539dbb8f705e13629ba6f23388976aad809e387f32a6e5c0712e4e8d9bfcce7",
-                "sha256:758098b38c344d9a7f279baf0689261777e601f620078ef5afdc9bd3339965c3",
-                "sha256:762206ba3bf1d6c8c9e0055871d3c0d5b074b7c3120193e6c067e7866f106ab1",
-                "sha256:771c9a3851beaa617d8c8115d65f834a2b52490f42ee2b88b13f1fc5529e9e0c",
-                "sha256:81e7a27365b02fe70a77f1365376879917235b3fec551d19b4c91b51d0bc1d07",
-                "sha256:8338db3c76833d02dc21c3e2c42534091341d26e4f7ba32c6032bb558a02e07b",
-                "sha256:8426f97117b914b9bfb2a7bd46edc148e8defda728a55a5df3a564abe70cd7a4",
-                "sha256:842855bbb113a19c393c6de5aa6ed9a26c6b13c2fead5e49114d39f0d08b94d8",
-                "sha256:87453d491369cd8018016d2714a13e8461975161703c18ee31eecf087a8ae5d4",
-                "sha256:875fe8dffb43c20f68379ee098b035a7038d7903c795d46715f66575a7050b19",
-                "sha256:8ad4dfda52e64af3202ceb2143a62deba97894b71c64a4405ee80f6b3ea77285",
-                "sha256:8c48fc7458fe3a74dcdf56ba3534ff41bd421f69436df09ff3497fdaac18b431",
-                "sha256:8cbb040fec8eddd5a6a75e737fd73c9ce37e51f94bacdd0b178d0174a4758395",
-                "sha256:92d28a608127b357da47c99e0d0e0655ca2060286540fe9f2a25a2e8ac666e05",
-                "sha256:931bf3d0705b2834fed29354f35170fa022fe22a95542b61b7c66aca5f8a224f",
-                "sha256:93bbd66f46dddc41e8c656130c97c0fb515e0fa44e1eebb2592769dbbd41b2f5",
-                "sha256:9ad4640a409bc2b7d22b7921e7660f0db96c5c8c69fbb2e8f3261d4f71d33983",
-                "sha256:a4366f264fa60d3c109f0b27af0cd9eb8d46746bd70bd3d9d425f035b6c7e286",
-                "sha256:a73ed43d64209e853bba567a543170267a5cd64f359540b0ca2d597e329ba172",
-                "sha256:a810a57ce5e8ecf8eac6ec4dab534ff80c34e5a2c31db60e992009cd20f58e0f",
-                "sha256:b4660943030406aaa40ec9f51960dd88049903d9536bc3c8ebb5cc4e1f119bbe",
-                "sha256:b8906f537978da3f7f0bd1ba37b69f6a877bb43312023b086582707d2835bf2f",
-                "sha256:b91bfef5daa2a5a4fe62f8d317fc91a626073639f951f851bd2cb252d01bc6c5",
-                "sha256:ba1fc34d0b2f6fd53377a4c954116251eba6d076bf64f903311f4a7d27d10acd",
-                "sha256:ba235e00e0878ba1080b0f2a761f143b2a2d1c354f3d8e507fbf2f3de401bf18",
-                "sha256:bb11809b0de643a292a82f728c494a2bbef0e30a7c42d37464abbd6bef7ca7b1",
-                "sha256:c17b43fe9c6da16885e3fe28922bcd1a029e61631fb771c7d501019b40bcc904",
-                "sha256:c1c21030ed494deb10226f90e2dbd84a012d59810c409832714a3dd576527be2",
-                "sha256:c398a5a8e258dfdc5ea2aa4e5aa2ca3207f654a8eb268693dd1a76939074a588",
-                "sha256:c637188b930175c256f13adbfc427b83ec7e64476d1ec9d6608f312bb84e06c3",
-                "sha256:c7b4450093c0c909299770226fb0285be47b0a57545bae25b5c4e51566b0e587",
-                "sha256:c8fd7a16f7a047e06c747cfcf2acef3ac316132df1c6077445b29ee6f3f3a70b",
-                "sha256:ca505fd3767a09a139737f3278bc8a485cb64043062da89bcba27e2f2ea78d33",
-                "sha256:d1522025cda9e57329aade769f56e5793b2a5da7759a21914ee10e67e17e601e",
-                "sha256:d276280649305c1da6cdd84585d48ae1f0efa67434d8b10d2df95228e59a05bb",
-                "sha256:d33622dc63c295788eed09dbb1d11bed178909d3267b02d873116ee6be368244",
-                "sha256:d4f2af3107fe4dc40c0d1a2409863f5249c6796398a1d83c1d99a0b3fa6cfb8d",
-                "sha256:d5469b347445d1c31105f33e7bfc9a8ba213d48e42641a610dda65bf9e3c83f5",
-                "sha256:d80fd710b3307a3c63809048b72c536689b9b0b31a2518339c3f1a4d29c73d7a",
-                "sha256:d9bb9242b38a664f307b3b897f093896f7ed51ef4fe25a0502e5a368de9151ea",
-                "sha256:d9ceca96df54cb1675a0b7f52f1c6d5d1df62c5b40741ba211780f1b05a282a2",
-                "sha256:dc2c00acdf68f1f69a476b770af311a7dc3955b7de228b04a40bcc51ac4d743b",
-                "sha256:dfdabdf8519c93908b2bf0f87c3f86f9e88bab279fb4acfd0907519ca5a1739f",
-                "sha256:e04919ffa9a728c446b27b6b625fa1d00ece221bdb9d633e978a7e0353a12c0e",
-                "sha256:e0abcce5e874474d3eab5ad53be03dae2abe651d248bdeaabe83708e82969e78",
-                "sha256:e1c04fb380bc8efaae2fdf17ed6cd5d223da78a8b0b18a610f53d4c5d6e31dfd",
-                "sha256:e23dcdd4b2ff9c6b3317ea7921b210d39592f8ca1cdea58ada25b202c65c0a69",
-                "sha256:e34a3e665d38d0749072e6565400c8ce9abae976e338919a0dfbfb0e1ba43068",
-                "sha256:e6da2e0500742e0f157f005924a0589f2e2dcbfdd6cd0cc0abce367433e989be",
-                "sha256:e9aa4af6b879bb75a3c7766fbf49d77f4097dd12b548ecbbd8b3f85caa833281",
-                "sha256:e9bbdba9e75b1a9ee1dd1335034dad998ef1acc08492226c6fd50aa773bdfa7d",
-                "sha256:e9d4293b21c69ee4f9e1a99ac4f772951d345611c614a0cfae2ec6b565279bc9",
-                "sha256:eadd2417e83a77ce3ae4a0efd08cb0ebdfd317b6406d11020354a53ad458ec84",
-                "sha256:ed0102146574e5e9f079b2e1a06e6b5b12a691f9c74a65b93b7f3d4feda566c6",
-                "sha256:f0fb8efc9e579acf1e556fd86277fecec320c21ca9b5d39db96433ad8c45bc4a",
-                "sha256:f4e9946c8c7def17e4fcb5eddb14c4eb6ebc7f6f309075e6c8d23b133c104607",
-                "sha256:f7649c8b8e4bd1ccc5fcbd51a855d57a617deeba19c66e3d04b1abecc61036b2",
-                "sha256:f980a0640599a74f27fd9d50c84c293f1cb7afc2046c5c6d3efaf8ec7cdbc326",
-                "sha256:f9dc2113e0cf0dd637751ca736186fca63664939ceb9f9f67e93ade88c69c0c9",
-                "sha256:fde778947304e55fc732bc8ea5c6063e74244ac1808471cb498983a210aaf62c",
-                "sha256:fe23687924b25a2dee52fab15976fd6577ed8518072bcda9ff2e2b88ab1f168b"
+                "sha256:0545928bdf53dfdfcab284468212efefb8a6608ca3b6910c7fb2e5ed8bdc2dc0",
+                "sha256:05fdeae9010533e47715c37df83264df0122584e40d691d50cf3607c060952a3",
+                "sha256:09a1f000c5f6e08b298275bae00921e9fbbf2a35dae0a86db2821c058c2201a9",
+                "sha256:0a53592cdf98cec3dfcdb24ffec8a4797e7656b65700099af43ec7df023b6de4",
+                "sha256:0f057a0c546c42964836b209d8de9ea1a4f4b0432006c6343cbe633d8ca14571",
+                "sha256:0f9eb37d3a60b262a98ab51ee899cac039de9ca0ce68dcf1a6518a09719020b0",
+                "sha256:102be79c4cc47a4aeb5912401185c404cd2601c15a7163bbecff7f1bfe20b669",
+                "sha256:128cbaed7ba26116820bcb992405d6a13ea18c8fca1b8c4f59906d858e91e979",
+                "sha256:149b4d875ef9b12a8f5e303e86a32a58f8ef627e57ec97a7d0e4be819069d141",
+                "sha256:153248f48d6f90a295a502f53ec544a3ffbd21b0bb32f5dca39c4b93a764d6a2",
+                "sha256:157a023bded0618a1eea54979fe2e0f9309e9ddc818ef4b8fc3b884ff38fedd5",
+                "sha256:15fa4ca658f8ad22645d3531682b17e5580832efbfa87304c3e62214c79c1e8a",
+                "sha256:198067aa6f3d942ff5d0d655bb1e91b59ae85279d47590682cba2834ac1b97d2",
+                "sha256:1c40e02cc4f3e18fd39344edb10eebe04bd11cfd13119606b5771e5ea51630d3",
+                "sha256:1ded65691a1d3fd7d2aa89d2c91aa51f941601bb2ce099739909034d957fef4b",
+                "sha256:201650b309c419143775c15209c620627de3c09a27c7fb58375325aec5cce260",
+                "sha256:2143c3aed85992604d758bbe67da839fb4aab3dd2e1c6dddab5b3ca7162b34a2",
+                "sha256:2177e59c033bf0d1bf7de1ced561205963583caf3242c6c700a723034bfb5f8e",
+                "sha256:2ea23f1525d4f64286dbe0947c929d45c3ffe963b2dbed1d3844a2e4938bda42",
+                "sha256:31264187fc934ff1024a4f56775f33c9252d3f4f3e27ec07d1995a26b52702c3",
+                "sha256:36ce951800ed2acc6772fd9f42150f29d567f0423989748052fdb39d9e2b5795",
+                "sha256:3aaa22487477de9618ce3b37f99fbe81219ba96f3c2ca84f576f0ab451b83aba",
+                "sha256:3e7e99e2af59c56c59b6c964d612511b8203480d39d1ef83edc56f2cb42a3f5d",
+                "sha256:413a30a99d8683dace3765885920ed27ab662efbb6c98d81db76c397ad1ffd71",
+                "sha256:447ae1104fb32197b9262f772d565d38e834cc2e9edd89350b37b88fed636e70",
+                "sha256:4659b2e4a5008715099e216050f5c6976e5a4329482664411789968b82e3f17d",
+                "sha256:48ee97c7c6027fd423058675b5a39d0b5f7a1648250b671563d5c9f74ff13ff0",
+                "sha256:4ba6c66fbc6015b2f99e7176fec41793cecb00c4cc357cad038dff85e6ac42ab",
+                "sha256:4c8dc7331e8cbb1c0ea2bcb550adb1777365944ffd125c69aa1117fdef4887f5",
+                "sha256:50e4b5d291105f7063259fe0125b1af902fb34499444d7c5c521dd8328b00939",
+                "sha256:542eb246d5be31b5e0a9c8ddb9539416f9b31f58f75bd4ee328bff2b5c58d6fd",
+                "sha256:55d371b9d8b0c2a68a50413a8cb01c3c3ce1ea4f768bf77b66669a9a486e101e",
+                "sha256:580ccbf11f02f948add4cb641843030a89f1463d7c0740cbfc9aca91e9dc34b3",
+                "sha256:5dbff9402c2bdf00bf0df9905694b3c292a3847c725651938a72f554351a5fcb",
+                "sha256:5f941fb86195f97be7f6efe04a21b223f05dfe4d1dfb159999e2f8d101e44cc4",
+                "sha256:608c84699b2db09c6a8743845b1a3dad36fae53eaaecb241d45b13dff74405fb",
+                "sha256:626b9feb01bff049a5aec4804f0c58db12585778b4902e5376a95b01f80a7a16",
+                "sha256:66f4f48a89cdd30ab3a47335df81c76e9a63799d0d84b29c0618371c66fa37b0",
+                "sha256:6c8e97e19aa7b0b0d801a159f932ce4435f1049c8c38e2bb372bb5bee559ce50",
+                "sha256:72407065ad459db9f3d052ea8c51e02534f02533fc61e51cbab3bd94166f086c",
+                "sha256:734783dd7da58f76222f458346ddebdb3621686a1a2a667db5049caf0c9956b9",
+                "sha256:76eaa4c087a061a2c8a0a92536405069878a8f530c00e84a9eaf332e70f5561f",
+                "sha256:776a06cb5720556a549829896a49acebb5bdd96c7bba100191a994053546975a",
+                "sha256:7839b7528faa4d134c183b1f2dd1ee4dc2ca2f899f4f0cfdf00fc04c255262a7",
+                "sha256:8080467df22feca0fc9c46567001777c6fbc2b4a2683a7137420896051874ca1",
+                "sha256:85060e96953647871957d41707adb8d7bff4e977042fd0deb4fc1881b98dd2fe",
+                "sha256:8954b9ffe60f479a0c0ba40987db2546c735ab02a725ea7fd89342152d4d821d",
+                "sha256:8a603155db408f773637f9e3a712c6e3cbc521aaa8fa2b99f9ba6106c59a2496",
+                "sha256:8bd9ec1db79a664f4cbb12878693b73416f4d2cb425d3e27eccc1bdfbdc826ef",
+                "sha256:8c0c324879d483504b07f7b18eb1b50567c434263bbe4866ecce33056162668a",
+                "sha256:8ce729f1dc8a4a190c34b69f75377bddc004079b2963ab722ab91fafe040be6d",
+                "sha256:8ec41049c90d204a6561238a9ad6c7263ebb7009d9759c98b58078d9d2fec9ba",
+                "sha256:959ae04ed30cde606f3a0320f0a1f4167a107e685ef5209cce28c5080590bd31",
+                "sha256:96559e05bdf938b2048353e10a7920b98f853cefe4482c2064a718d7d0a50bd7",
+                "sha256:96b3759d8ab2323324e0a92b2f44834f9d88089b8d1ab6f533b61f4be3411cef",
+                "sha256:97c5ffe47ccf92d8b17e10f8a5ce28d015aa1196edc3359684cf31504eae6a14",
+                "sha256:9d5b925156a746dc1f5f52376fdd1fbdd3f6ffe1fcd6f5e06f77ca79abb940a3",
+                "sha256:9dae4eb9b5534e09ba6c6ab496a757e5e394b7e7b08767d25ca37e8d36491114",
+                "sha256:a083221b6a4ecdef38a60c95d8d3223d99449cb4da2544e9644958dc16664eb9",
+                "sha256:a0ed14a4162c2c2b21a162c9fcf90057e3e7da18cd171ab344c1e1664f75090e",
+                "sha256:a18aedc032d6468b73ebbe4437129cb30d54fe543cde2f23671ecad76c3aea24",
+                "sha256:a451dba533be77454ebcffc85189108fc05f279100835ac76e7989edacb89156",
+                "sha256:aa2ba0176037c915d8660a4e46581d645e2c22b5373e466bc8640a794d45861a",
+                "sha256:ab27dd4edd84b13309f268ffcdfc07aef8339135ffab7b6d43f16884307a2a48",
+                "sha256:ab784621d3e2a41916e21f13a483602cc989fd45fff637634b9231ba43d4383b",
+                "sha256:b07fa9e634234e84096adfa4be3828c8f26e238679c122824b2b3d7131bec578",
+                "sha256:b09209cdfcacf5eba9cf80367130532e6c02e695252e1f64d3cfcc2356e6e19f",
+                "sha256:babec324e8654a59122aaa66936a9a483faa03276db9792f51332475c2dddc4a",
+                "sha256:bca4428c4a957b78ded3e6e62884ab03f029dce8fa8d34818da0f80f61332b49",
+                "sha256:c0467838c90435b80793cde486a318fc916ee57f2af54e4b10c72b20cbdcbaa9",
+                "sha256:c2a214bf5b79bd39a9de1c991353aaaacafda83ba1374178309e92be8e67d411",
+                "sha256:c3029f481b31f329b1fdb4ec4b56935d82210ddd9c6f86ea5a87c06f1e97b161",
+                "sha256:c6f3fd617db422c9d4e12cb8d84c984fe07d6d9cb0950cbf117f3bccc6268d05",
+                "sha256:c783e4ed68200f4e03c125690d23158b1c49c4b186d458a18debc109bbdc3c2e",
+                "sha256:c8502a02ae3ae67084f5a0bf5a8253b19fa7a887f824e41e016cdb0ac532a06f",
+                "sha256:c88535f83f7391cf3a45af990237e3939a6fdfbedaed2571633bfdd0bceb36b0",
+                "sha256:c9ce6b83597d45bec44a2690857ede62fc98223772135f8a7fa90884eb726501",
+                "sha256:ca4657e9fd0b1b5376942d403d634ce188f79064f0873aa853ab05b10185ceec",
+                "sha256:d0ff8d5b13ce2357fa8b33a0a2e3775aa71df5bf7c8ba060634c9d15ab12f357",
+                "sha256:d280b4bf09f719b89fd9aab3b71067acc0d0449b7d1eba99a2ade4939cef8296",
+                "sha256:d3777c446bb1c5fcd82dc3f8776e1a146cd91e80cc1892f8634575ace438d22f",
+                "sha256:d7833ef6f5d6cb634f296abfd93452fb3eb44c4e9a6ae95c1021eab704c1cee2",
+                "sha256:d8306f27418361b788e3fca9f47dec125457f80122e7e31ba7ff5cdba98343f8",
+                "sha256:d962e2e89b3a95e3597a34b8c93ced1e98958502c5b8096c9fd69deff279f561",
+                "sha256:dbe428d0ac6eacaf05402adbaf137f59ad6063848182d1ff294f95ce0f24005b",
+                "sha256:e4f91d702b9ce1388660b3d4a28aa552614a1399e93f718ed0dacd68f23b3d32",
+                "sha256:e69acdbc132c9592c8dc393af85e38e206ca847c7019a953ff625191c3a12312",
+                "sha256:e8056adcefa2dcb67e8bc91ea5eee26df66e8b297a8cd6ff0903f85c70908fa0",
+                "sha256:e9ac7280bd045f472b50306d7efeee051b69e3a2dd1b90f46bd7e86e63b1efa2",
+                "sha256:eb013aa01b404219f28dc973d9e6310fd4db216d7299253dd355629952e0564e",
+                "sha256:ec1ccc2a9f764cd632fb8ab28fdde166250df54fc8d97315a4a6948dc5367639",
+                "sha256:ef7282d8a14b60dd515e47060638687710b1d518f4b5e961caad43fb3a3606f9",
+                "sha256:ef92b1fbe6aa2e7885eb90853cc016b1fc95439a8cc8da6d526880e9e2148695",
+                "sha256:efb2ad60ca8637d5f9f653f9a9a8d73964059972b6b95036be77e028bffc68a3",
+                "sha256:effcae2152afe7937a28376dbabb25c770ef99ed4e16a4ffeb8e6a4f7c4f06aa",
+                "sha256:f2d1b58a0c3a73f0361759642e80260a6d28eee6501b40fe25b82af33ef83f21",
+                "sha256:f57e2d0f8022783426121b586d7c842ea40ea832a29e28ca36c881b54c74fb28",
+                "sha256:f5cae9b415ea8a6a563566dbf46650222eccc5971c7daa16fbee63aef92ae543",
+                "sha256:f76c6f319e57007ad52e671ec741d801324760a377e3d4992c9bb8200333ebac",
+                "sha256:f91bfc39f7a64168e08ab831fa497ec5438c1d6c6e2f9e12848d95ad11ac8523",
+                "sha256:fdaee3947eaaa52dae3ceb9d9f66329e13d8bae35682b1e5dd54612938693934",
+                "sha256:fe3f245c2f39a5692d9123c174bc48f6f9fe3e96407e67c6d04541a767d99e72",
+                "sha256:ffae97d28ea4f2c613a751d087b75a97fb78311b38cc2e9a2f4587e473ace167"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==0.22.0"
+            "version": "==0.22.1"
         },
         "six": {
             "hashes": [
diff --git a/dbrepo-search-service/init/Pipfile.lock b/dbrepo-search-service/init/Pipfile.lock
index 4655511a0b07c784d5a5b9363205a8bd7b232975..c08493b2f96cd43463da5e7886036514911b5ad1 100644
--- a/dbrepo-search-service/init/Pipfile.lock
+++ b/dbrepo-search-service/init/Pipfile.lock
@@ -823,11 +823,11 @@
         },
         "pydantic": {
             "hashes": [
-                "sha256:2bc2d7f17232e0841cbba4641e65ba1eb6fafb3a08de3a091ff3ce14a197c4fa",
-                "sha256:cfb96e45951117c3024e6b67b25cdc33a3cb7b2fa62e239f7af1378358a1d99e"
+                "sha256:be04d85bbc7b65651c5f8e6b9976ed9c6f41782a55524cef079a34a0bb82144d",
+                "sha256:cb5ac360ce894ceacd69c403187900a02c4b20b693a9dd1d643e1effab9eadf9"
             ],
             "markers": "python_version >= '3.8'",
-            "version": "==2.10.2"
+            "version": "==2.10.3"
         },
         "pydantic-core": {
             "hashes": [
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.5.2.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.5.2.tar.gz
index d2dd0148cb1210d12778ba92bae329e092b96311..52bf0fe9a030ce509450bc52427eb7e2c1f1da13 100644
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.5.2.tar.gz and b/dbrepo-search-service/init/lib/dbrepo-1.5.2.tar.gz differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.5.2.tar.gz b/dbrepo-search-service/lib/dbrepo-1.5.2.tar.gz
index d2dd0148cb1210d12778ba92bae329e092b96311..52bf0fe9a030ce509450bc52427eb7e2c1f1da13 100644
Binary files a/dbrepo-search-service/lib/dbrepo-1.5.2.tar.gz and b/dbrepo-search-service/lib/dbrepo-1.5.2.tar.gz differ
diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md
index 0452c93f8e589d3b5134b6456389815474607dff..759e67bf4362bb0b53b49d3d24e24db396e37ad9 100644
--- a/helm/dbrepo/README.md
+++ b/helm/dbrepo/README.md
@@ -86,6 +86,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `authservice.enabled`            | Enable the Auth Service.                                     | `true`                                                                                                                                                                                                                                                                                                                                                                                                     |
 | `authservice.image.debug`        | Set the logging level to `trace`. Otherwise, set to `info`.  | `false`                                                                                                                                                                                                                                                                                                                                                                                                    |
 | `authservice.endpoint`           | The hostname for the microservices.                          | `http://auth-service`                                                                                                                                                                                                                                                                                                                                                                                      |
+| `authservice.resourcesPreset`    | The container resource presets                               | `small`                                                                                                                                                                                                                                                                                                                                                                                                    |
 | `authservice.jwt.pubkey`         | The JWT public key from the `dbrepo-client`.                 | `MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB` |
 | `authservice.tls.enabled`        | Enable TLS/SSL communication. Required for HTTPS.            | `true`                                                                                                                                                                                                                                                                                                                                                                                                     |
 | `authservice.tls.existingSecret` | The secret containing the `tls.crt`, `tls.key` and `ca.crt`. | `ingress-cert`                                                                                                                                                                                                                                                                                                                                                                                             |
@@ -109,105 +110,137 @@ The command removes all the Kubernetes components associated with the chart and
 
 ### Search Database
 
-| Name                   | Description                         | Value       |
-| ---------------------- | ----------------------------------- | ----------- |
-| `searchdb.enabled`     | Enable the Data datadb.             | `true`      |
-| `searchdb.host`        | The hostname for the microservices. | `search-db` |
-| `searchdb.port`        | The port for the microservices.     | `9200`      |
-| `searchdb.clusterName` | The cluster name.                   | `search-db` |
+| Name                                    | Description                         | Value       |
+| --------------------------------------- | ----------------------------------- | ----------- |
+| `searchdb.enabled`                      | Enable the Data datadb.             | `true`      |
+| `searchdb.host`                         | The hostname for the microservices. | `search-db` |
+| `searchdb.port`                         | The port for the microservices.     | `9200`      |
+| `searchdb.coordinating.resourcesPreset` | The container resource preset       | `small`     |
+| `searchdb.ingest.resourcesPreset`       | The container resource preset       | `micro`     |
+| `searchdb.master.resourcesPreset`       | The container resource preset       | `small`     |
+| `searchdb.data.resourcesPreset`         | The container resource preset       | `medium`    |
+| `searchdb.clusterName`                  | The cluster name.                   | `search-db` |
 
 ### Upload Service
 
-| Name                         | Description                | Value  |
-| ---------------------------- | -------------------------- | ------ |
-| `uploadservice.enabled`      | Enable the Upload Service. | `true` |
-| `uploadservice.replicaCount` | The number of replicas.    | `2`    |
+| Name                                                              | Description                                                                                                       | Value                            |
+| ----------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | -------------------------------- |
+| `uploadservice.enabled`                                           | Enable the Upload Service.                                                                                        | `true`                           |
+| `uploadservice.s3.endpoint`                                       | The S3-capable endpoint the microservice connects to.                                                             | `http://storage-service-s3:8333` |
+| `uploadservice.s3.bucket`                                         | The S3 bucket name.                                                                                               | `dbrepo`                         |
+| `uploadservice.s3.maxSize`                                        | The maximum file size in bytes.                                                                                   | `2000000000`                     |
+| `uploadservice.podSecurityContext.enabled`                        | Enable pods' Security Context                                                                                     | `true`                           |
+| `uploadservice.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                                                                                | `Always`                         |
+| `uploadservice.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface                                                                    | `[]`                             |
+| `uploadservice.podSecurityContext.supplementalGroups`             | Set filesystem extra groups                                                                                       | `[]`                             |
+| `uploadservice.podSecurityContext.fsGroup`                        | Set RabbitMQ pod's Security Context fsGroup                                                                       | `0`                              |
+| `uploadservice.containerSecurityContext.enabled`                  | Enable containers' Security Context                                                                               | `true`                           |
+| `uploadservice.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                                                                                  | `{}`                             |
+| `uploadservice.containerSecurityContext.runAsUser`                | Set RabbitMQ containers' Security Context runAsUser                                                               | `1000`                           |
+| `uploadservice.containerSecurityContext.runAsGroup`               | Set RabbitMQ containers' Security Context runAsGroup                                                              | `1000`                           |
+| `uploadservice.containerSecurityContext.runAsNonRoot`             | Set RabbitMQ container's Security Context runAsNonRoot                                                            | `true`                           |
+| `uploadservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation                                                                              | `false`                          |
+| `uploadservice.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                                           | `false`                          |
+| `uploadservice.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot                                                                     | `["ALL"]`                        |
+| `uploadservice.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile                                                                  | `RuntimeDefault`                 |
+| `uploadservice.resourcesPreset`                                   | The container resource preset                                                                                     | `nano`                           |
+| `uploadservice.resources`                                         | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}`                             |
+| `uploadservice.replicaCount`                                      | The number of replicas.                                                                                           | `2`                              |
 
 ### Broker Service
 
-| Name                                | Description                                                                                                                      | Value                                                                                      |
-| ----------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------ |
-| `brokerservice.enabled`             | Enable the Broker Service.                                                                                                       | `true`                                                                                     |
-| `brokerservice.image.debug`         | Set the logging level to `trace`. Otherwise, set to `info`.                                                                      | `true`                                                                                     |
-| `brokerservice.endpoint`            | The management api endpoint for the microservices.                                                                               | `http://broker-service:15672`                                                              |
-| `brokerservice.host`                | The hostname for the microservices.                                                                                              | `broker-service`                                                                           |
-| `brokerservice.port`                | The port for the microservices.                                                                                                  | `5672`                                                                                     |
-| `brokerservice.virtualHost`         | The default virtual host name.                                                                                                   | `dbrepo`                                                                                   |
-| `brokerservice.queueName`           | The default queue name.                                                                                                          | `dbrepo`                                                                                   |
-| `brokerservice.exchangeName`        | The default exchange name.                                                                                                       | `dbrepo`                                                                                   |
-| `brokerservice.routingKey`          | The default routing key binding from the default queue to the default exchange.                                                  | `dbrepo.#`                                                                                 |
-| `brokerservice.connectionTimeout`   | The connection timeout in ms.                                                                                                    | `60000`                                                                                    |
-| `brokerservice.ldap.binddn`         | The domain name the broker service should bind to. In many cases this is the admin user from `identityservice.global.adminUser`. | `cn=admin,dc=dbrepo,dc=at`                                                                 |
-| `brokerservice.ldap.bindpw`         | The password to bind on the identity service. In many cases this value is equal to `identityservice.global.adminPassword`.       | `admin`                                                                                    |
-| `brokerservice.ldap.uidField`       | The field containing the user id.                                                                                                | `uid`                                                                                      |
-| `brokerservice.ldap.basedn`         | The base domain name containing the users.                                                                                       | `dc=dbrepo,dc=at`                                                                          |
-| `brokerservice.ldap.userDnPattern`  | The pattern to determine the user.                                                                                               | `${username}`                                                                              |
-| `brokerservice.extraPlugins`        | The list of plugins to be activated.                                                                                             | `rabbitmq_prometheus rabbitmq_auth_backend_ldap rabbitmq_auth_mechanism_ssl rabbitmq_mqtt` |
-| `brokerservice.persistence.enabled` | If set to true, a PVC will be created.                                                                                           | `false`                                                                                    |
-| `brokerservice.replicaCount`        | The number of replicas.                                                                                                          | `1`                                                                                        |
+| Name                                             | Description                                                                                                                      | Value                                                                                      |
+| ------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------ |
+| `brokerservice.enabled`                          | Enable the Broker Service.                                                                                                       | `true`                                                                                     |
+| `brokerservice.image.debug`                      | Set the logging level to `trace`. Otherwise, set to `info`.                                                                      | `true`                                                                                     |
+| `brokerservice.endpoint`                         | The management api endpoint for the microservices.                                                                               | `http://broker-service:15672`                                                              |
+| `brokerservice.host`                             | The hostname for the microservices.                                                                                              | `broker-service`                                                                           |
+| `brokerservice.port`                             | The port for the microservices.                                                                                                  | `5672`                                                                                     |
+| `brokerservice.virtualHost`                      | The default virtual host name.                                                                                                   | `dbrepo`                                                                                   |
+| `brokerservice.queueName`                        | The default queue name.                                                                                                          | `dbrepo`                                                                                   |
+| `brokerservice.exchangeName`                     | The default exchange name.                                                                                                       | `dbrepo`                                                                                   |
+| `brokerservice.routingKey`                       | The default routing key binding from the default queue to the default exchange.                                                  | `dbrepo.#`                                                                                 |
+| `brokerservice.connectionTimeout`                | The connection timeout in ms.                                                                                                    | `60000`                                                                                    |
+| `brokerservice.ldap.binddn`                      | The domain name the broker service should bind to. In many cases this is the admin user from `identityservice.global.adminUser`. | `cn=admin,dc=dbrepo,dc=at`                                                                 |
+| `brokerservice.ldap.bindpw`                      | The password to bind on the identity service. In many cases this value is equal to `identityservice.global.adminPassword`.       | `admin`                                                                                    |
+| `brokerservice.ldap.uidField`                    | The field containing the user id.                                                                                                | `uid`                                                                                      |
+| `brokerservice.ldap.basedn`                      | The base domain name containing the users.                                                                                       | `dc=dbrepo,dc=at`                                                                          |
+| `brokerservice.ldap.userDnPattern`               | The pattern to determine the user.                                                                                               | `${username}`                                                                              |
+| `brokerservice.auth.tls.enabled`                 | Enable TLS support                                                                                                               | `false`                                                                                    |
+| `brokerservice.auth.tls.existingSecretFullChain` | If set to `true` the service uses the full chain in the certificate `tls.crt`, otherwise it attempts to read from `ca.crt`       | `false`                                                                                    |
+| `brokerservice.auth.tls.existingSecret`          | Existing secret with certificate content                                                                                         | `ingress-cert`                                                                             |
+| `brokerservice.extraPlugins`                     | The list of plugins to be activated.                                                                                             | `rabbitmq_prometheus rabbitmq_auth_backend_ldap rabbitmq_auth_mechanism_ssl rabbitmq_mqtt` |
+| `brokerservice.persistence.enabled`              | If set to true, a PVC will be created.                                                                                           | `false`                                                                                    |
+| `brokerservice.extraConfiguration`               | The extra configuration for MQTT                                                                                                 | `mqtt.vhost = dbrepo
+mqtt.exchange = dbrepo
+mqtt.prefetch = 10
+`                           |
+| `brokerservice.replicaCount`                     | The number of replicas.                                                                                                          | `1`                                                                                        |
 
 ### Analyse Service
 
-| Name                                                               | Description                                                 | Value                     |
-| ------------------------------------------------------------------ | ----------------------------------------------------------- | ------------------------- |
-| `analyseservice.enabled`                                           | Enable the Broker Service.                                  | `true`                    |
-| `analyseservice.image.debug`                                       | Set the logging level to `trace`. Otherwise, set to `info`. | `false`                   |
-| `analyseservice.podSecurityContext.enabled`                        | Enable pods' Security Context                               | `true`                    |
-| `analyseservice.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                          | `Always`                  |
-| `analyseservice.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface              | `[]`                      |
-| `analyseservice.podSecurityContext.supplementalGroups`             | Set filesystem extra groups                                 | `[]`                      |
-| `analyseservice.podSecurityContext.fsGroup`                        | Set RabbitMQ pod's Security Context fsGroup                 | `1001`                    |
-| `analyseservice.containerSecurityContext.enabled`                  | Enabled containers' Security Context                        | `true`                    |
-| `analyseservice.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                            | `{}`                      |
-| `analyseservice.containerSecurityContext.runAsUser`                | Set RabbitMQ containers' Security Context runAsUser         | `1001`                    |
-| `analyseservice.containerSecurityContext.runAsGroup`               | Set RabbitMQ containers' Security Context runAsGroup        | `1001`                    |
-| `analyseservice.containerSecurityContext.runAsNonRoot`             | Set RabbitMQ container's Security Context runAsNonRoot      | `true`                    |
-| `analyseservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation                        | `false`                   |
-| `analyseservice.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem     | `false`                   |
-| `analyseservice.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot               | `["ALL"]`                 |
-| `analyseservice.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile            | `RuntimeDefault`          |
-| `analyseservice.endpoint`                                          | The url of the endpoint.                                    | `http://analyse-service`  |
-| `analyseservice.s3.proto`                                          | The protocol of the storage service endpoint.               | `http`                    |
-| `analyseservice.s3.endpoint`                                       | The hostname and port of the storage service endpoint.      | `storage-service-s3:8333` |
-| `analyseservice.replicaCount`                                      | The number of replicas.                                     | `2`                       |
+| Name                                                               | Description                                                                                                       | Value                     |
+| ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------- | ------------------------- |
+| `analyseservice.enabled`                                           | Enable the Broker Service.                                                                                        | `true`                    |
+| `analyseservice.podSecurityContext.enabled`                        | Enable pods' Security Context                                                                                     | `true`                    |
+| `analyseservice.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                                                                                | `Always`                  |
+| `analyseservice.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface                                                                    | `[]`                      |
+| `analyseservice.podSecurityContext.supplementalGroups`             | Set filesystem extra groups                                                                                       | `[]`                      |
+| `analyseservice.podSecurityContext.fsGroup`                        | Set RabbitMQ pod's Security Context fsGroup                                                                       | `1001`                    |
+| `analyseservice.containerSecurityContext.enabled`                  | Enabled containers' Security Context                                                                              | `true`                    |
+| `analyseservice.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                                                                                  | `{}`                      |
+| `analyseservice.containerSecurityContext.runAsUser`                | Set RabbitMQ containers' Security Context runAsUser                                                               | `1001`                    |
+| `analyseservice.containerSecurityContext.runAsGroup`               | Set RabbitMQ containers' Security Context runAsGroup                                                              | `1001`                    |
+| `analyseservice.containerSecurityContext.runAsNonRoot`             | Set RabbitMQ container's Security Context runAsNonRoot                                                            | `true`                    |
+| `analyseservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation                                                                              | `false`                   |
+| `analyseservice.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                                           | `false`                   |
+| `analyseservice.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot                                                                     | `["ALL"]`                 |
+| `analyseservice.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile                                                                  | `RuntimeDefault`          |
+| `analyseservice.resourcesPreset`                                   | The container resource preset                                                                                     | `micro`                   |
+| `analyseservice.resources`                                         | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}`                      |
+| `analyseservice.endpoint`                                          | The url of the endpoint.                                                                                          | `http://analyse-service`  |
+| `analyseservice.s3.proto`                                          | The protocol of the storage service endpoint.                                                                     | `http`                    |
+| `analyseservice.s3.endpoint`                                       | The hostname and port of the storage service endpoint.                                                            | `storage-service-s3:8333` |
+| `analyseservice.replicaCount`                                      | The number of replicas.                                                                                           | `2`                       |
 
 ### Metadata Service
 
-| Name                                                                | Description                                                                        | Value                            |
-| ------------------------------------------------------------------- | ---------------------------------------------------------------------------------- | -------------------------------- |
-| `metadataservice.enabled`                                           | Enable the Broker Service.                                                         | `true`                           |
-| `metadataservice.image.debug`                                       | Set the logging level to `trace`. Otherwise, set to `info`.                        | `false`                          |
-| `metadataservice.podSecurityContext.enabled`                        | Enable pods' Security Context                                                      | `true`                           |
-| `metadataservice.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                                                 | `Always`                         |
-| `metadataservice.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface                                     | `[]`                             |
-| `metadataservice.podSecurityContext.supplementalGroups`             | Set filesystem extra groups                                                        | `[]`                             |
-| `metadataservice.podSecurityContext.fsGroup`                        | Set RabbitMQ pod's Security Context fsGroup                                        | `1001`                           |
-| `metadataservice.containerSecurityContext.enabled`                  | Enable containers' Security Context                                                | `true`                           |
-| `metadataservice.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                                                   | `{}`                             |
-| `metadataservice.containerSecurityContext.runAsUser`                | Set RabbitMQ containers' Security Context runAsUser                                | `1001`                           |
-| `metadataservice.containerSecurityContext.runAsGroup`               | Set RabbitMQ containers' Security Context runAsGroup                               | `1001`                           |
-| `metadataservice.containerSecurityContext.runAsNonRoot`             | Set RabbitMQ container's Security Context runAsNonRoot                             | `true`                           |
-| `metadataservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation                                               | `false`                          |
-| `metadataservice.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                            | `false`                          |
-| `metadataservice.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot                                      | `["ALL"]`                        |
-| `metadataservice.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile                                   | `RuntimeDefault`                 |
-| `metadataservice.endpoint`                                          | The Metadata Service endpoint.                                                     | `http://metadata-service`        |
-| `metadataservice.crossref.endpoint`                                 | The CrossRef endpoint.                                                             | `http://data.crossref.org`       |
-| `metadataservice.ror.endpoint`                                      | The ROR endpoint.                                                                  | `https://api.ror.org`            |
-| `metadataservice.admin.email`                                       | The OAI-PMH exposed e-mail for contacting the metadata records responsible person. | `noreply@example.com`            |
-| `metadataservice.deletedRecord`                                     | The OAI-PMH exposed delete policy.                                                 | `permanent`                      |
-| `metadataservice.repositoryName`                                    | The OAI-PMH exposed repository name.                                               | `Database Repository`            |
-| `metadataservice.granularity`                                       | The OAI-PMH exposed record granularity.                                            | `YYYY-MM-DDThh:mm:ssZ`           |
-| `metadataservice.datacite.enabled`                                  | If set to true, the service mints DOIs instead of local PIDs.                      | `false`                          |
-| `metadataservice.datacite.url`                                      | The DataCite api endpoint url.                                                     | `https://api.datacite.org`       |
-| `metadataservice.datacite.prefix`                                   | The DataCite prefix.                                                               | `""`                             |
-| `metadataservice.datacite.username`                                 | The DataCite api username.                                                         | `""`                             |
-| `metadataservice.datacite.password`                                 | The DataCite api user password.                                                    | `""`                             |
-| `metadataservice.sparql.connectionTimeout`                          | The connection timeout for sparql queries fetching remote data in ms.              | `10000`                          |
-| `metadataservice.s3.endpoint`                                       | The S3-capable endpoint the microservice connects to.                              | `http://storage-service-s3:8333` |
-| `metadataservice.s3.auth.username`                                  | The S3-capable endpoint username (or access key id).                               | `seaweedfsadmin`                 |
-| `metadataservice.s3.auth.password`                                  | The S3-capable endpoint user password (or access key secret).                      | `seaweedfsadmin`                 |
-| `metadataservice.replicaCount`                                      | The number of replicas.                                                            | `2`                              |
+| Name                                                                | Description                                                                                                       | Value                            |
+| ------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | -------------------------------- |
+| `metadataservice.enabled`                                           | Enable the Broker Service.                                                                                        | `true`                           |
+| `metadataservice.podSecurityContext.enabled`                        | Enable pods' Security Context                                                                                     | `true`                           |
+| `metadataservice.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                                                                                | `Always`                         |
+| `metadataservice.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface                                                                    | `[]`                             |
+| `metadataservice.podSecurityContext.supplementalGroups`             | Set filesystem extra groups                                                                                       | `[]`                             |
+| `metadataservice.podSecurityContext.fsGroup`                        | Set RabbitMQ pod's Security Context fsGroup                                                                       | `1001`                           |
+| `metadataservice.containerSecurityContext.enabled`                  | Enable containers' Security Context                                                                               | `true`                           |
+| `metadataservice.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                                                                                  | `{}`                             |
+| `metadataservice.containerSecurityContext.runAsUser`                | Set RabbitMQ containers' Security Context runAsUser                                                               | `1001`                           |
+| `metadataservice.containerSecurityContext.runAsGroup`               | Set RabbitMQ containers' Security Context runAsGroup                                                              | `1001`                           |
+| `metadataservice.containerSecurityContext.runAsNonRoot`             | Set RabbitMQ container's Security Context runAsNonRoot                                                            | `true`                           |
+| `metadataservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation                                                                              | `false`                          |
+| `metadataservice.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                                           | `false`                          |
+| `metadataservice.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot                                                                     | `["ALL"]`                        |
+| `metadataservice.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile                                                                  | `RuntimeDefault`                 |
+| `metadataservice.resourcesPreset`                                   | The container resource preset                                                                                     | `micro`                          |
+| `metadataservice.resources`                                         | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}`                             |
+| `metadataservice.endpoint`                                          | The Metadata Service endpoint.                                                                                    | `http://metadata-service`        |
+| `metadataservice.crossref.endpoint`                                 | The CrossRef endpoint.                                                                                            | `http://data.crossref.org`       |
+| `metadataservice.ror.endpoint`                                      | The ROR endpoint.                                                                                                 | `https://api.ror.org`            |
+| `metadataservice.admin.email`                                       | The OAI-PMH exposed e-mail for contacting the metadata records responsible person.                                | `noreply@example.com`            |
+| `metadataservice.deletedRecord`                                     | The OAI-PMH exposed delete policy.                                                                                | `permanent`                      |
+| `metadataservice.repositoryName`                                    | The OAI-PMH exposed repository name.                                                                              | `Database Repository`            |
+| `metadataservice.granularity`                                       | The OAI-PMH exposed record granularity.                                                                           | `YYYY-MM-DDThh:mm:ssZ`           |
+| `metadataservice.datacite.enabled`                                  | If set to true, the service mints DOIs instead of local PIDs.                                                     | `false`                          |
+| `metadataservice.datacite.url`                                      | The DataCite api endpoint url.                                                                                    | `https://api.datacite.org`       |
+| `metadataservice.datacite.prefix`                                   | The DataCite prefix.                                                                                              | `""`                             |
+| `metadataservice.datacite.username`                                 | The DataCite api username.                                                                                        | `""`                             |
+| `metadataservice.datacite.password`                                 | The DataCite api user password.                                                                                   | `""`                             |
+| `metadataservice.sparql.connectionTimeout`                          | The connection timeout for sparql queries fetching remote data in ms.                                             | `10000`                          |
+| `metadataservice.s3.endpoint`                                       | The S3-capable endpoint the microservice connects to.                                                             | `http://storage-service-s3:8333` |
+| `metadataservice.s3.auth.username`                                  | The S3-capable endpoint username (or access key id).                                                              | `seaweedfsadmin`                 |
+| `metadataservice.s3.auth.password`                                  | The S3-capable endpoint user password (or access key secret).                                                     | `seaweedfsadmin`                 |
+| `metadataservice.replicaCount`                                      | The number of replicas.                                                                                           | `2`                              |
 
 ### Data Service
 
@@ -215,7 +248,6 @@ The command removes all the Kubernetes components associated with the chart and
 | --------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------- |
 | `dataservice.enabled`                                           | Enable the Broker Service.                                                                                                                       | `true`                                                                                                                      |
 | `dataservice.endpoint`                                          | Absolute URL to the data service in the form of http://host:port                                                                                 | `http://data-service`                                                                                                       |
-| `dataservice.image.debug`                                       | Set the logging level to `trace`. Otherwise, set to `info`.                                                                                      | `false`                                                                                                                     |
 | `dataservice.podSecurityContext.enabled`                        | Enable pods' Security Context                                                                                                                    | `true`                                                                                                                      |
 | `dataservice.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                                                                                                               | `Always`                                                                                                                    |
 | `dataservice.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface                                                                                                   | `[]`                                                                                                                        |
@@ -230,6 +262,8 @@ The command removes all the Kubernetes components associated with the chart and
 | `dataservice.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                                                                          | `false`                                                                                                                     |
 | `dataservice.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot                                                                                                    | `["ALL"]`                                                                                                                   |
 | `dataservice.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile                                                                                                 | `RuntimeDefault`                                                                                                            |
+| `dataservice.resourcesPreset`                                   | The container resource preset                                                                                                                    | `large`                                                                                                                     |
+| `dataservice.resources`                                         | Set container requests and limits for different resources like CPU or memory (essential for production workloads)                                | `{}`                                                                                                                        |
 | `dataservice.grant.read`                                        | The default database permissions for users with read access.                                                                                     | `SELECT`                                                                                                                    |
 | `dataservice.grant.write`                                       | The default database permissions for users with write access.                                                                                    | `SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE` |
 | `dataservice.rabbitmq.consumerConcurrentMin`                    | The minimal number of RabbitMQ consumers.                                                                                                        | `2`                                                                                                                         |
@@ -239,104 +273,126 @@ The command removes all the Kubernetes components associated with the chart and
 | `dataservice.rabbitmq.consumer.password`                        | The user password for the consumer to read tuples from the broker service. In many cases this value is equal to `identityservice.userPasswords`. | `admin`                                                                                                                     |
 | `dataservice.s3.endpoint`                                       | The S3-capable endpoint the microservice connects to.                                                                                            | `http://storage-service-s3:8333`                                                                                            |
 | `dataservice.s3.bucket`                                         | The S3 bucket name.                                                                                                                              | `dbrepo`                                                                                                                    |
-| `dataservice.s3.auth.username`                                  | The S3-capable endpoint username (or access key id).                                                                                             | `seaweedfsadmin`                                                                                                            |
-| `dataservice.s3.auth.password`                                  | The S3-capable endpoint user password (or access key secret).                                                                                    | `seaweedfsadmin`                                                                                                            |
+| `dataservice.s3.auth.accessKeyId`                               | The S3-capable endpoint username (or access key id).                                                                                             | `seaweedfsadmin`                                                                                                            |
+| `dataservice.s3.auth.secretAccessKey`                           | The S3-capable endpoint user password (or access key secret).                                                                                    | `seaweedfsadmin`                                                                                                            |
 | `dataservice.s3.filePath`                                       | The local location to download/upload files from/to S3-capable endpoint.                                                                         | `/s3`                                                                                                                       |
 | `dataservice.replicaCount`                                      | The number of replicas.                                                                                                                          | `2`                                                                                                                         |
 
 ### Search Service
 
-| Name                                                              | Description                                                        | Value                   |
-| ----------------------------------------------------------------- | ------------------------------------------------------------------ | ----------------------- |
-| `searchservice.enabled`                                           | Enable the Broker Service.                                         | `true`                  |
-| `searchservice.endpoint`                                          | Absolute URL to the search service in the form of http://host:port | `http://search-service` |
-| `searchservice.image.debug`                                       | Set the logging level to `trace`. Otherwise, set to `info`.        | `false`                 |
-| `searchservice.podSecurityContext.enabled`                        | Enable pods' Security Context                                      | `true`                  |
-| `searchservice.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                                 | `Always`                |
-| `searchservice.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface                     | `[]`                    |
-| `searchservice.podSecurityContext.supplementalGroups`             | Set filesystem extra groups                                        | `[]`                    |
-| `searchservice.podSecurityContext.fsGroup`                        | Set RabbitMQ pod's Security Context fsGroup                        | `1001`                  |
-| `searchservice.containerSecurityContext.enabled`                  | Enabled containers' Security Context                               | `true`                  |
-| `searchservice.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                                   | `{}`                    |
-| `searchservice.containerSecurityContext.runAsUser`                | Set RabbitMQ containers' Security Context runAsUser                | `1001`                  |
-| `searchservice.containerSecurityContext.runAsGroup`               | Set RabbitMQ containers' Security Context runAsGroup               | `1001`                  |
-| `searchservice.containerSecurityContext.runAsNonRoot`             | Set RabbitMQ container's Security Context runAsNonRoot             | `true`                  |
-| `searchservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation                               | `false`                 |
-| `searchservice.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem            | `true`                  |
-| `searchservice.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot                      | `["ALL"]`               |
-| `searchservice.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile                   | `RuntimeDefault`        |
-| `searchservice.replicaCount`                                      | The number of replicas.                                            | `2`                     |
+| Name                                                              | Description                                                                                                       | Value                   |
+| ----------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ----------------------- |
+| `searchservice.enabled`                                           | Enable the Broker Service.                                                                                        | `true`                  |
+| `searchservice.endpoint`                                          | Absolute URL to the search service in the form of http://host:port                                                | `http://search-service` |
+| `searchservice.podSecurityContext.enabled`                        | Enable pods' Security Context                                                                                     | `true`                  |
+| `searchservice.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                                                                                | `Always`                |
+| `searchservice.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface                                                                    | `[]`                    |
+| `searchservice.podSecurityContext.supplementalGroups`             | Set filesystem extra groups                                                                                       | `[]`                    |
+| `searchservice.podSecurityContext.fsGroup`                        | Set RabbitMQ pod's Security Context fsGroup                                                                       | `1001`                  |
+| `searchservice.containerSecurityContext.enabled`                  | Enabled containers' Security Context                                                                              | `true`                  |
+| `searchservice.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                                                                                  | `{}`                    |
+| `searchservice.containerSecurityContext.runAsUser`                | Set RabbitMQ containers' Security Context runAsUser                                                               | `1001`                  |
+| `searchservice.containerSecurityContext.runAsGroup`               | Set RabbitMQ containers' Security Context runAsGroup                                                              | `1001`                  |
+| `searchservice.containerSecurityContext.runAsNonRoot`             | Set RabbitMQ container's Security Context runAsNonRoot                                                            | `true`                  |
+| `searchservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation                                                                              | `false`                 |
+| `searchservice.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                                           | `true`                  |
+| `searchservice.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot                                                                     | `["ALL"]`               |
+| `searchservice.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile                                                                  | `RuntimeDefault`        |
+| `searchservice.resourcesPreset`                                   | The container resource preset                                                                                     | `micro`                 |
+| `searchservice.resources`                                         | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}`                    |
+| `searchservice.init.resourcesPreset`                              | The container resource preset                                                                                     | `nano`                  |
+| `searchservice.init.resources`                                    | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}`                    |
+| `searchservice.replicaCount`                                      | The number of replicas.                                                                                           | `2`                     |
 
 ### Storage Service
 
-| Name                                          | Description                                                                            | Value            |
-| --------------------------------------------- | -------------------------------------------------------------------------------------- | ---------------- |
-| `storageservice.enabled`                      | Enable the Storage Service.                                                            | `true`           |
-| `storageservice.mariadb.auth.rootPassword`    | The user password for the root user.                                                   | `seaweedfsdb`    |
-| `storageservice.filer.enabled`                | Enable the storage service filer which is required for S3.                             | `true`           |
-| `storageservice.s3.replicaCount`              | The number of replicas.                                                                | `2`              |
-| `storageservice.s3.bucket`                    | The S3-bucket name.                                                                    | `dbrepo`         |
-| `storageservice.s3.auth.enabled`              | Enable the S3 service.                                                                 | `true`           |
-| `storageservice.s3.auth.adminAccessKeyId`     | The S3 access key id for the admin user. In some systems this is named `username`.     | `seaweedfsadmin` |
-| `storageservice.s3.auth.adminSecretAccessKey` | The S3 secret access key for the admin user. In some systems this is named `password`. | `seaweedfsadmin` |
+| Name                                          | Description                                                                                                       | Value            |
+| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ---------------- |
+| `storageservice.enabled`                      | Enable the Storage Service.                                                                                       | `true`           |
+| `storageservice.mariadb.enabled`              | Enables the MariaDB database needed for the filer.                                                                | `true`           |
+| `storageservice.mariadb.auth.rootPassword`    | The password for the root user.                                                                                   | `seaweedfsfiler` |
+| `storageservice.filer.enabled`                | Cannot use the filer in the standard component since it's incompatible with OpenShift                             | `true`           |
+| `storageservice.s3.bucket`                    | The S3-bucket name.                                                                                               | `dbrepo`         |
+| `storageservice.s3.auth.enabled`              | Enable the S3 service.                                                                                            | `true`           |
+| `storageservice.s3.auth.adminAccessKeyId`     | The S3 access key id for the admin user. In some systems this is named `username`.                                | `seaweedfsadmin` |
+| `storageservice.s3.auth.adminSecretAccessKey` | The S3 secret access key for the admin user. In some systems this is named `password`.                            | `seaweedfsadmin` |
+| `storageservice.s3.auth.readAccessKeyId`      | The S3 access key id for the read only user.                                                                      | `seaweedfsuser`  |
+| `storageservice.s3.auth.readSecretAccessKey`  | The S3 secret access key for the read only user.                                                                  | `seaweedfsuser`  |
+| `storageservice.init.resourcesPreset`         | The container resource preset                                                                                     | `nano`           |
+| `storageservice.init.resources`               | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}`             |
 
 ### Identity Service
 
-| Name                                   | Description                                                                                                   | Value             |
-| -------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ----------------- |
-| `identityservice.enabled`              | Enable the Identity Service.                                                                                  | `true`            |
-| `identityservice.global.ldapDomain`    | The LDAP domain name in domain "dbrepo.at" form or explicit in "dc=dbrepo,dc=at" form.                        | `dc=dbrepo,dc=at` |
-| `identityservice.global.adminUser`     | The admin username that is used to bind.                                                                      | `admin`           |
-| `identityservice.global.adminPassword` | The admin user password that is used to bind.                                                                 | `admin`           |
-| `identityservice.users`                | The admin username for internal authentication.                                                               | `admin`           |
-| `identityservice.userPasswords`        | The admin user password for internal authentication.                                                          | `admin`           |
-| `identityservice.group`                | The group that contains the administrators for the broker service.                                            | `system`          |
-| `identityservice.persistence.enabled`  | If set to true, a PVC will be created.                                                                        | `true`            |
-| `identityservice.replication.enabled`  | If set to true, the pods required a cluster. Needs `replicaCount` to be `3` or higher (of 2n+1).              | `false`           |
-| `identityservice.replicaCount`         | The number of replicas. If `replicaCount` is set to more than 1, requires `replication.enabled` to be `true`. | `1`               |
+| Name                                                                | Description                                                                                                       | Value                  |
+| ------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ---------------------- |
+| `identityservice.enabled`                                           | Enable the Identity Service.                                                                                      | `true`                 |
+| `identityservice.global.ldapDomain`                                 | The LDAP domain name in domain "dbrepo.at" form or explicit in "dc=dbrepo,dc=at" form.                            | `dc=dbrepo,dc=at`      |
+| `identityservice.global.adminUser`                                  | The admin username that is used to bind.                                                                          | `admin`                |
+| `identityservice.global.adminPassword`                              | The admin user password that is used to bind.                                                                     | `admin`                |
+| `identityservice.podSecurityContext.enabled`                        | Enable pods' Security Context                                                                                     | `true`                 |
+| `identityservice.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                                                                                | `Always`               |
+| `identityservice.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface                                                                    | `[]`                   |
+| `identityservice.podSecurityContext.supplementalGroups`             | Set filesystem extra groups                                                                                       | `[]`                   |
+| `identityservice.podSecurityContext.fsGroup`                        | Set RabbitMQ pod's Security Context fsGroup                                                                       | `1001`                 |
+| `identityservice.containerSecurityContext.enabled`                  | Enabled containers' Security Context                                                                              | `true`                 |
+| `identityservice.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                                                                                  | `{}`                   |
+| `identityservice.containerSecurityContext.runAsUser`                | Set RabbitMQ containers' Security Context runAsUser                                                               | `1001`                 |
+| `identityservice.containerSecurityContext.runAsGroup`               | Set RabbitMQ containers' Security Context runAsGroup                                                              | `0`                    |
+| `identityservice.containerSecurityContext.runAsNonRoot`             | Set RabbitMQ container's Security Context runAsNonRoot                                                            | `true`                 |
+| `identityservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation                                                                              | `false`                |
+| `identityservice.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                                           | `false`                |
+| `identityservice.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot                                                                     | `["ALL"]`              |
+| `identityservice.containerSecurityContext.capabilities.add`         | Set container's Security Context runAsNonRoot                                                                     | `["NET_BIND_SERVICE"]` |
+| `identityservice.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile                                                                  | `RuntimeDefault`       |
+| `identityservice.resourcesPreset`                                   | The container resource preset                                                                                     | `nano`                 |
+| `identityservice.resources`                                         | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}`                   |
+| `identityservice.users`                                             | The admin username for internal authentication.                                                                   | `admin`                |
+| `identityservice.userPasswords`                                     | The admin user password for internal authentication.                                                              | `admin`                |
+| `identityservice.group`                                             | The group that contains the administrators for the broker service.                                                | `system`               |
+| `identityservice.persistence.enabled`                               | If set to true, a PVC will be created.                                                                            | `true`                 |
 
 ### User Interface
 
-| Name                                                   | Description                                                                                          | Value                   |
-| ------------------------------------------------------ | ---------------------------------------------------------------------------------------------------- | ----------------------- |
-| `ui.enabled`                                           | Enable the Broker Service.                                                                           | `true`                  |
-| `ui.image.debug`                                       | Set the logging level to `trace`. Otherwise, set to `info`.                                          | `false`                 |
-| `ui.podSecurityContext.enabled`                        | Enable pods' Security Context                                                                        | `true`                  |
-| `ui.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                                                                   | `Always`                |
-| `ui.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface                                                       | `[]`                    |
-| `ui.podSecurityContext.supplementalGroups`             | Set filesystem extra groups                                                                          | `[]`                    |
-| `ui.podSecurityContext.fsGroup`                        | Set RabbitMQ pod's Security Context fsGroup                                                          | `1001`                  |
-| `ui.containerSecurityContext.enabled`                  | Enabled containers' Security Context                                                                 | `true`                  |
-| `ui.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                                                                     | `{}`                    |
-| `ui.containerSecurityContext.runAsUser`                | Set RabbitMQ containers' Security Context runAsUser                                                  | `1001`                  |
-| `ui.containerSecurityContext.runAsGroup`               | Set RabbitMQ containers' Security Context runAsGroup                                                 | `1001`                  |
-| `ui.containerSecurityContext.runAsNonRoot`             | Set RabbitMQ container's Security Context runAsNonRoot                                               | `true`                  |
-| `ui.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation                                                                 | `false`                 |
-| `ui.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                              | `false`                 |
-| `ui.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot                                                        | `["ALL"]`               |
-| `ui.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile                                                     | `RuntimeDefault`        |
-| `ui.public.api.client`                                 | The endpoint for the client api. Defaults to the value of `gateway`.                                 | `""`                    |
-| `ui.public.api.server`                                 | The endpoint for the server api. Defaults to the value of `gateway`.                                 | `""`                    |
-| `ui.public.upload.client`                              | The endpoint for the upload client. Defaults to the value of `gateway` and path `/api/upload/files`. | `""`                    |
-| `ui.public.title`                                      | The user interface title.                                                                            | `Database Repository`   |
-| `ui.public.logo`                                       | The user interface logo.                                                                             | `/logo.svg`             |
-| `ui.public.icon`                                       | The user interface icon.                                                                             | `/favicon.ico`          |
-| `ui.public.touch`                                      | The user interface apple touch icon.                                                                 | `/apple-touch-icon.png` |
-| `ui.public.broker.host`                                | The displayed broker hostname.                                                                       | `example.com`           |
-| `ui.public.broker.port.5671`                           | Enable display of the broker 5671 port and mark it as secure (SSL/TLS).                              | `false`                 |
-| `ui.public.broker.port.5672`                           | Enable display of the broker 5672 port and mark it as insecure (no SSL/TLS).                         | `true`                  |
-| `ui.public.broker.extra`                               | Extra metadata displayed.                                                                            | `""`                    |
-| `ui.public.database.extra`                             | Extra metadata displayed.                                                                            | `""`                    |
-| `ui.public.pid.default.publisher`                      | The default dataset publisher for persisted identifiers.                                             | `Example University`    |
-| `ui.public.doi.enabled`                                | Enable the display that DOIs are minted.                                                             | `false`                 |
-| `ui.public.doi.endpoint`                               | The DOI proxy.                                                                                       | `https://doi.org`       |
-| `ui.replicaCount`                                      | The number of replicas.                                                                              | `2`                     |
+| Name                                                   | Description                                                                                                       | Value                   |
+| ------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------- | ----------------------- |
+| `ui.enabled`                                           | Enable the Broker Service.                                                                                        | `true`                  |
+| `ui.podSecurityContext.enabled`                        | Enable pods' Security Context                                                                                     | `true`                  |
+| `ui.podSecurityContext.fsGroupChangePolicy`            | Set filesystem group change policy                                                                                | `Always`                |
+| `ui.podSecurityContext.sysctls`                        | Set kernel settings using the sysctl interface                                                                    | `[]`                    |
+| `ui.podSecurityContext.supplementalGroups`             | Set filesystem extra groups                                                                                       | `[]`                    |
+| `ui.podSecurityContext.fsGroup`                        | Set RabbitMQ pod's Security Context fsGroup                                                                       | `1001`                  |
+| `ui.containerSecurityContext.enabled`                  | Enabled containers' Security Context                                                                              | `true`                  |
+| `ui.containerSecurityContext.seLinuxOptions`           | Set SELinux options in container                                                                                  | `{}`                    |
+| `ui.containerSecurityContext.runAsUser`                | Set RabbitMQ containers' Security Context runAsUser                                                               | `1001`                  |
+| `ui.containerSecurityContext.runAsGroup`               | Set RabbitMQ containers' Security Context runAsGroup                                                              | `1001`                  |
+| `ui.containerSecurityContext.runAsNonRoot`             | Set RabbitMQ container's Security Context runAsNonRoot                                                            | `true`                  |
+| `ui.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation                                                                              | `false`                 |
+| `ui.containerSecurityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                                           | `false`                 |
+| `ui.containerSecurityContext.capabilities.drop`        | Set container's Security Context runAsNonRoot                                                                     | `["ALL"]`               |
+| `ui.containerSecurityContext.seccompProfile.type`      | Set container's Security Context seccomp profile                                                                  | `RuntimeDefault`        |
+| `ui.resourcesPreset`                                   | The container resource preset                                                                                     | `micro`                 |
+| `ui.resources`                                         | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}`                    |
+| `ui.public.api.client`                                 | The endpoint for the client api. Defaults to the value of `gateway`.                                              | `""`                    |
+| `ui.public.api.server`                                 | The endpoint for the server api. Defaults to the value of `gateway`.                                              | `""`                    |
+| `ui.public.upload.client`                              | The endpoint for the upload client. Defaults to the value of `gateway` and path `/api/upload/files`.              | `""`                    |
+| `ui.public.title`                                      | The user interface title.                                                                                         | `Database Repository`   |
+| `ui.public.logo`                                       | The user interface logo.                                                                                          | `/logo.svg`             |
+| `ui.public.icon`                                       | The user interface icon.                                                                                          | `/favicon.ico`          |
+| `ui.public.touch`                                      | The user interface apple touch icon.                                                                              | `/apple-touch-icon.png` |
+| `ui.public.broker.host`                                | The displayed broker hostname.                                                                                    | `example.com`           |
+| `ui.public.broker.extra`                               | Extra metadata displayed.                                                                                         | `""`                    |
+| `ui.public.database.extra`                             | Extra metadata displayed.                                                                                         | `""`                    |
+| `ui.public.pid.default.publisher`                      | The default dataset publisher for persisted identifiers.                                                          | `Example University`    |
+| `ui.public.doi.enabled`                                | Enable the display that DOIs are minted.                                                                          | `false`                 |
+| `ui.public.doi.endpoint`                               | The DOI proxy.                                                                                                    | `https://doi.org`       |
+| `ui.replicaCount`                                      | The number of replicas.                                                                                           | `2`                     |
 
 ### Dashboard Service
 
 | Name                                          | Description                                                                                                            | Value  |
 | --------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ------ |
 | `dashboardservice.enabled`                    | Enable the Dashboard Service.                                                                                          | `true` |
+| `dashboardservice.metrics.enabled`            | Enable the metrics sidecar.                                                                                            | `true` |
 | `dashboardservice.dashboardsProvider.enabled` | Enable the default dashboard provisioning provider to routinely import dashboards from /opt/bitnami/grafana/dashboards | `true` |
 
 ### Metric Service
@@ -345,6 +401,188 @@ The command removes all the Kubernetes components associated with the chart and
 | ------------------ | -------------------------- | ------ |
 | `metricdb.enabled` | Enable the Metric Service. | `true` |
 
+### Gateway Service
+
+| Name                          | Description                                   | Value                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+| ----------------------------- | --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `gatewayservice.enabled`      | Enable the Gateway Service.                   | `true`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| `gatewayservice.serverBlock`  | The extra configuration for the reverse proxy | `# This is required to proxy Grafana Live WebSocket connections.
+map $http_upgrade $connection_upgrade {
+  default upgrade;
+  '' close;
+}
+
+upstream analyse {
+    server analyse-service;
+}
+
+upstream data {
+    server data-service;
+}
+
+upstream metadata {
+    server metadata-service;
+}
+
+upstream search {
+    server search-service;
+}
+
+upstream ui {
+    server ui;
+}
+
+upstream upload {
+    server upload-service;
+}
+
+upstream dashboard-service {
+    server dashboard-service:3000;
+}
+
+server {
+    listen 8080 default_server;
+    server_name _;
+
+    location /assets/ {
+        root                    /etc/nginx/assets;
+        expires                 max;
+        access_log              off;
+        autoindex               on;
+        autoindex_exact_size    off;
+        autoindex_format        html;
+        autoindex_localtime     on;
+    }
+
+    location /dashboard/ {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://dashboard-service;
+        proxy_read_timeout      90;
+    }
+
+    # Proxy Grafana Live WebSocket connections.
+    location /dashboard/api/live/ {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_set_header        Upgrade $http_upgrade;
+        proxy_set_header        Connection $connection_upgrade;
+        proxy_http_version      1.1;
+        proxy_pass              http://dashboard-service;
+        proxy_read_timeout      90;
+    }
+
+    location /api/search {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://search;
+        proxy_read_timeout      90;
+    }
+
+    location /api/upload {
+#         allow 128.130.0.0/16;
+#         deny all;
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_set_header        X-Forwarded-Host $host;
+        proxy_pass              http://upload;
+        proxy_read_timeout      90;
+        # Disable request and response buffering
+        proxy_request_buffering off;
+        proxy_buffering         off;
+        proxy_http_version      1.1;
+    }
+
+    location /api/analyse {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://analyse;
+        proxy_read_timeout      90;
+    }
+
+    location ~ /api/database/([0-9]+)/table/([0-9]+)/(data|history|export|statistic) {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://data;
+        proxy_read_timeout      90;
+    }
+
+    location ~ /api/database/([0-9]+)/view/([0-9]+)/(data|export) {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://data;
+        proxy_read_timeout      90;
+    }
+
+    location ~ /api/database/([0-9]+)/view {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://metadata;
+        proxy_read_timeout      90;
+    }
+
+    location ~ /api/database/([0-9]+)/subset {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://data;
+        proxy_read_timeout      600;
+    }
+
+    location ~ /api/(database|concept|container|identifier|image|message|license|oai|ontology|unit|user) {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://metadata;
+        proxy_read_timeout      90;
+    }
+
+    location ~ /pid/([0-9]+) {
+        rewrite /pid/(.*) /api/identifier/$1 break;
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://metadata;
+        proxy_read_timeout      90;
+    }
+
+    location / {
+        proxy_set_header        Host $host;
+        proxy_set_header        X-Real-IP $remote_addr;
+        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header        X-Forwarded-Proto $scheme;
+        proxy_pass              http://ui;
+        proxy_read_timeout      90;
+    }
+}
+` |
+| `gatewayservice.replicaCount` | The number of replicas.                       | `3`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+
+### Analytics Service
+
+| Name                      | Description                                            | Value      |
+| ------------------------- | ------------------------------------------------------ | ---------- |
+| `computeservice.endpoint` | Configure the number of parallel workers with local[n] | `local[2]` |
+
 ### Ingress
 
 | Name                     | Description                                                                                                     | Value          |
diff --git a/helm/dbrepo/charts/seaweedfs-1.0.2.tgz b/helm/dbrepo/charts/seaweedfs-1.0.2.tgz
index 2e7037c8a14d50045bbcb119e175155a3eee6f2e..0ac203f4e83ff558bfd0435d39e643a51b8ad38d 100644
Binary files a/helm/dbrepo/charts/seaweedfs-1.0.2.tgz and b/helm/dbrepo/charts/seaweedfs-1.0.2.tgz differ
diff --git a/helm/dbrepo/values.schema.json b/helm/dbrepo/values.schema.json
index 8ff5fa482a24e0eb0d2ed4335612e12d330e6c94..67f1c5c2b653527cb1fd4b7a790e5f12e69dfe12 100644
--- a/helm/dbrepo/values.schema.json
+++ b/helm/dbrepo/values.schema.json
@@ -86,6 +86,10 @@
                 "replicaCount": {
                     "type": "integer"
                 },
+                "resources": {
+                    "properties": {},
+                    "type": "object"
+                },
                 "resourcesPreset": {
                     "type": "string"
                 },
@@ -244,6 +248,9 @@
                                 },
                                 "existingSecret": {
                                     "type": "string"
+                                },
+                                "existingSecretFullChain": {
+                                    "type": "boolean"
                                 }
                             },
                             "type": "object"
@@ -263,6 +270,9 @@
                 "exchangeName": {
                     "type": "string"
                 },
+                "extraConfiguration": {
+                    "type": "string"
+                },
                 "extraPlugins": {
                     "type": "string"
                 },
@@ -698,6 +708,10 @@
                 "replicaCount": {
                     "type": "integer"
                 },
+                "resources": {
+                    "properties": {},
+                    "type": "object"
+                },
                 "resourcesPreset": {
                     "type": "string"
                 },
@@ -894,6 +908,10 @@
                     },
                     "type": "object"
                 },
+                "resources": {
+                    "properties": {},
+                    "type": "object"
+                },
                 "resourcesPreset": {
                     "type": "string"
                 },
@@ -1143,6 +1161,10 @@
                 "repositoryName": {
                     "type": "string"
                 },
+                "resources": {
+                    "properties": {},
+                    "type": "object"
+                },
                 "resourcesPreset": {
                     "type": "string"
                 },
@@ -1409,6 +1431,10 @@
                             },
                             "type": "object"
                         },
+                        "resources": {
+                            "properties": {},
+                            "type": "object"
+                        },
                         "resourcesPreset": {
                             "type": "string"
                         }
@@ -1438,6 +1464,10 @@
                 "replicaCount": {
                     "type": "integer"
                 },
+                "resources": {
+                    "properties": {},
+                    "type": "object"
+                },
                 "resourcesPreset": {
                     "type": "string"
                 }
@@ -1470,6 +1500,10 @@
                             },
                             "type": "object"
                         },
+                        "resources": {
+                            "properties": {},
+                            "type": "object"
+                        },
                         "resourcesPreset": {
                             "type": "string"
                         }
@@ -1745,6 +1779,10 @@
                 "replicaCount": {
                     "type": "integer"
                 },
+                "resources": {
+                    "properties": {},
+                    "type": "object"
+                },
                 "resourcesPreset": {
                     "type": "string"
                 }
@@ -1855,6 +1893,10 @@
                 "replicaCount": {
                     "type": "integer"
                 },
+                "resources": {
+                    "properties": {},
+                    "type": "object"
+                },
                 "resourcesPreset": {
                     "type": "string"
                 },
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 7a640cdb44d58c93db0d5df932d6f89cbb62ec78..1a122d2fe3c43f8455ca95565de0ef51946fc0fe 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -87,6 +87,7 @@ authservice:
     fullnameOverride: auth-db
     auth:
       postgresPassword: postgres
+  ## @param authservice.resourcesPreset The container resource presets
   resourcesPreset: "small"
   ## @skip authservice.extraStartupArgs
   extraStartupArgs: "--import-realm"
@@ -170,17 +171,21 @@ searchdb:
   ## @param searchdb.port The port for the microservices.
   port: 9200
   coordinating:
+    ## @param searchdb.coordinating.resourcesPreset The container resource preset
     resourcesPreset: "small"
   ingest:
     ## @skip searchdb.ingest.enabled The limited default payload does not require this node type.
     enabled: false
+    ## @param searchdb.ingest.resourcesPreset The container resource preset
     resourcesPreset: "micro"
   master:
+    ## @param searchdb.master.resourcesPreset The container resource preset
     resourcesPreset: "small"
   data:
+    ## @param searchdb.data.resourcesPreset The container resource preset
     resourcesPreset: "medium"
-  ## @skip searchdb.security
   security:
+    ## @skip searchdb.security.enabled
     enabled: false
   ## @param searchdb.clusterName The cluster name.
   clusterName: search-db
@@ -236,8 +241,7 @@ uploadservice:
   ## @param uploadservice.resourcesPreset The container resource preset
   resourcesPreset: "nano"
   ## @param uploadservice.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
-  ## Example:
-  ## resources:
+  resources: { }
   ##   requests:
   ##     cpu: 250m
   ##     memory: 64Mi
@@ -350,6 +354,7 @@ brokerservice:
         port: 1883
         targetPort: 1883
     # loadBalancerIP:
+  ## @param brokerservice.extraConfiguration The extra configuration for MQTT
   extraConfiguration: |
     mqtt.vhost = dbrepo
     mqtt.exchange = dbrepo
@@ -364,7 +369,7 @@ analyseservice:
   enabled: true
   image:
     ## @skip analyseservice.image.name
-    name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.5.1
+    name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.5.2
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   podSecurityContext:
     ## @param analyseservice.podSecurityContext.enabled Enable pods' Security Context
@@ -401,8 +406,7 @@ analyseservice:
   ## @param analyseservice.resourcesPreset The container resource preset
   resourcesPreset: "micro"
   ## @param analyseservice.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
-  ## Example:
-  ## resources:
+  resources: { }
   ##   requests:
   ##     cpu: 250m
   ##     memory: 64Mi
@@ -426,7 +430,7 @@ metadataservice:
   enabled: true
   image:
     ## @skip metadataservice.image.name
-    name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.5.1
+    name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.5.2
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   podSecurityContext:
     ## @param metadataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -463,8 +467,7 @@ metadataservice:
   ## @param metadataservice.resourcesPreset The container resource preset
   resourcesPreset: "micro"
   ## @param metadataservice.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
-  ## Example:
-  ## resources:
+  resources: { }
   ##   requests:
   ##     cpu: 250m
   ##     memory: 64Mi
@@ -524,7 +527,7 @@ dataservice:
   endpoint: http://data-service
   image:
     ## @skip dataservice.image.name
-    name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.5.2-rc0
+    name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.5.2
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   podSecurityContext:
     ## @param dataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -561,8 +564,7 @@ dataservice:
   ## @param dataservice.resourcesPreset The container resource preset
   resourcesPreset: "large"
   ## @param dataservice.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
-  ## Example:
-  ## resources:
+  resources: { }
   ##   requests:
   ##     cpu: 250m
   ##     memory: 64Mi
@@ -593,9 +595,9 @@ dataservice:
     ## @param dataservice.s3.bucket The S3 bucket name.
     bucket: dbrepo
     auth:
-      ## @param dataservice.s3.auth.username The S3-capable endpoint username (or access key id).
+      ## @param dataservice.s3.auth.accessKeyId The S3-capable endpoint username (or access key id).
       accessKeyId: seaweedfsadmin
-      ## @param dataservice.s3.auth.password The S3-capable endpoint user password (or access key secret).
+      ## @param dataservice.s3.auth.secretAccessKey The S3-capable endpoint user password (or access key secret).
       secretAccessKey: seaweedfsadmin
     ## @param dataservice.s3.filePath The local location to download/upload files from/to S3-capable endpoint.
     filePath: /s3
@@ -611,7 +613,7 @@ searchservice:
   endpoint: http://search-service
   image:
     ## @skip searchservice.image.name
-    name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.5.1
+    name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.5.2
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   podSecurityContext:
     ## @param searchservice.podSecurityContext.enabled Enable pods' Security Context
@@ -648,23 +650,21 @@ searchservice:
   ## @param searchservice.resourcesPreset The container resource preset
   resourcesPreset: "micro"
   ## @param searchservice.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
-  ## Example:
-  ## resources:
+  resources: { }
   ##   requests:
   ##     cpu: 250m
   ##     memory: 64Mi
   ##   limits:
   ##     cpu: 500m
   ##     memory: 1024Mi
-  ## @skip searchservice.init
   init:
     image:
-      name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.5.1
+      ## @skip searchservice.init.image.name
+      name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.5.2
     ## @param searchservice.init.resourcesPreset The container resource preset
     resourcesPreset: "nano"
     ## @param searchservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
-    ## Example:
-    ## resources:
+    resources: { }
     ##   requests:
     ##     cpu: 250m
     ##     memory: 64Mi
@@ -682,11 +682,15 @@ storageservice:
   ## @skip storageservice.fullnameOverride
   fullnameOverride: storage-service
   mariadb:
+    ## @param storageservice.mariadb.enabled Enables the MariaDB database needed for the filer.
     enabled: true
+    ## @skip storageservice.mariadb.fullnameOverride
     fullnameOverride: storage-db
     auth:
+      ## @param storageservice.mariadb.auth.rootPassword The password for the root user.
       rootPassword: seaweedfsfiler
   postgresql:
+    ## @skip storageservice.postgresql.enabled
     enabled: false
   master:
     metrics:
@@ -717,12 +721,11 @@ storageservice:
   init:
     image:
       ## @skip storageservice.init.image.name
-      name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.5.1
+      name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.5.2
     ## @param storageservice.init.resourcesPreset The container resource preset
     resourcesPreset: "nano"
     ## @param storageservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
-    ## Example:
-    ## resources:
+    resources: { }
     ##   requests:
     ##     cpu: 250m
     ##     memory: 64Mi
@@ -736,6 +739,7 @@ identityservice:
   ## @param identityservice.enabled Enable the Identity Service.
   enabled: true
   image:
+    ## @skip identityservice.image.name
     name: docker.io/bitnami/openldap:2.6.8-debian-12-r1
   global:
     ## @param identityservice.global.ldapDomain The LDAP domain name in domain "dbrepo.at" form or explicit in "dc=dbrepo,dc=at" form.
@@ -784,8 +788,7 @@ identityservice:
   ## @param identityservice.resourcesPreset The container resource preset
   resourcesPreset: "nano"
   ## @param identityservice.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
-  ## Example:
-  ## resources:
+  resources: { }
   ##   requests:
   ##     cpu: 250m
   ##     memory: 64Mi
@@ -824,7 +827,7 @@ ui:
   enabled: true
   image:
     ## @skip ui.image.name
-    name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.5.2-rc1
+    name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.5.2
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   podSecurityContext:
     ## @param ui.podSecurityContext.enabled Enable pods' Security Context
@@ -861,8 +864,7 @@ ui:
   ## @param ui.resourcesPreset The container resource preset
   resourcesPreset: "micro"
   ## @param ui.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
-  ## Example:
-  ## resources:
+  resources: { }
   ##   requests:
   ##     cpu: 250m
   ##     memory: 64Mi
@@ -890,6 +892,7 @@ ui:
     broker:
       ## @param ui.public.broker.host The displayed broker hostname.
       host: example.com
+      ## @skip ui.public.broker.connections The array of connections that should be displayed in the frontend.
       connections:
         - protocol: "amqp"
           port: "5672"
@@ -970,6 +973,7 @@ metricdb:
   ## @skip metricdb.fullnameOverride
   fullnameOverride: metric-db
   alertmanager:
+    ## @skip metricdb.alertmanager.enabled
     enabled: false
     service:
       ## @skip metricdb.alertmanager.service.type
@@ -1006,6 +1010,7 @@ gatewayservice:
   enabled: true
   ## @skip gatewayservice.fullnameOverride
   fullnameOverride: gateway-service
+  ## @param gatewayservice.serverBlock The extra configuration for the reverse proxy
   serverBlock: |
     # This is required to proxy Grafana Live WebSocket connections.
     map $http_upgrade $connection_upgrade {