diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0568200e..350ed048 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,23 @@ default:
   image: maven:3.8.4-jdk-8
 
 stages:
+  - lint
   - deploy
 
+check-helmreadme:
+  stage: lint
+  image: node:lts-alpine3.20
+  script:
+    - wget -qO- https://github.com/bitnami/readme-generator-for-helm/archive/refs/tags/2.6.1.tar.gz | tar -xz -C /tmp
+    - ln -s $CI_PROJECT_DIR/archetypes/project/src/main/resources/archetype-resources/deploy/docker/helm/src/main/chart /tmp/deploy
+    - ln -s $CI_PROJECT_DIR/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/helm/src/main/chart /tmp/repository
+    - cp /tmp/deploy/README.md /tmp/README_deploy.md && cp /tmp/repository/README.md /tmp/README_repository.md
+    - cd /tmp; npm install ./readme-generator-for-helm-2.6.1; cd readme-generator-for-helm-2.6.1
+    - ./bin/index.js -v /tmp/deploy/values.yaml -r /tmp/README_deploy.md
+    - ./bin/index.js -v /tmp/repository/values.yaml -r /tmp/README_repository.md
+    - diff /tmp/README_deploy.md /tmp/deploy/README.md         || (echo "README was not generated before committing." && exit 1)
+    - diff /tmp/README_repository.md /tmp/repository/README.md || (echo "README was not generated before committing." && exit 1)
+
 deploy:
   stage: deploy
   rules:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..aeb75fcb
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,12 @@
+repos:
+  - repo: https://github.com/bitnami/readme-generator-for-helm
+    rev: "2.6.1"
+    hooks:
+    - id: helm-readme-generator
+      pass_filenames: false
+      always_run: true
+      args: [--readme=archetypes/project/src/main/resources/archetype-resources/deploy/docker/helm/src/main/chart/README.md, --values=archetypes/project/src/main/resources/archetype-resources/deploy/docker/helm/src/main/chart/values.yaml]
+    - id: helm-readme-generator
+      pass_filenames: false
+      always_run: true
+      args: [--readme=archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/helm/src/main/chart/README.md, --values=archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/helm/src/main/chart/values.yaml]
diff --git a/archetypes/docker/src/main/resources/archetype-resources/src/main/build/Dockerfile b/archetypes/docker/src/main/resources/archetype-resources/src/main/build/Dockerfile
index 46dfaed9..c7d28a54 100644
--- a/archetypes/docker/src/main/resources/archetype-resources/src/main/build/Dockerfile
+++ b/archetypes/docker/src/main/resources/archetype-resources/src/main/build/Dockerfile
@@ -12,11 +12,11 @@ ARG project_version=dev
 ########################################################################################################################
 
 # TODO default value substituion doesn't work because of the '.' delimiter
-LABEL git.branch=${git_branch}
-LABEL git.closest.tag.name=${git_closest_tag_fixed}
-LABEL git.commit.id=${git_commit_id}
-LABEL git.dirty=${git_dirty}
-LABEL mvn.project.artifactId=${project_artifactId}
-LABEL mvn.project.groupId=${project_groupId}
-LABEL mvn.project.version=${project_version}
+LABEL git.branch=${git_branch} \
+git.closest.tag.name=${git_closest_tag_fixed} \
+git.commit.id=${git_commit_id} \
+git.dirty=${git_dirty} \
+mvn.project.artifactId=${project_artifactId} \
+mvn.project.groupId=${project_groupId} \
+mvn.project.version=${project_version}
 
diff --git a/archetypes/helm/src/main/resources/archetype-resources/deploy.sh b/archetypes/helm/src/main/resources/archetype-resources/deploy.sh
index b819c065..845d014e 100755
--- a/archetypes/helm/src/main/resources/archetype-resources/deploy.sh
+++ b/archetypes/helm/src/main/resources/archetype-resources/deploy.sh
@@ -4,11 +4,19 @@ set -o pipefail
 
 if [[ -z $1 ]] ; then
   echo ""
-  echo "deploy.sh <release> <chart> [<version|path>]"
+  echo "deploy.sh [-s skip checks and deploy directly] <release> <chart> [<version|path>]"
   echo ""
   exit 0
 fi
 
+SKIP=false
+while getopts s: opt; do
+    case $opt in
+        s) SKIP=true
+    esac
+    shift
+done
+
 RELEASE=${1?"release required"}
 CHART=${2?"chart required"}
 VERSION=${3:-"":->=0.0.0-0}
@@ -84,6 +92,7 @@ fi
 
 popd >/dev/null || exit
 
+if [ "$SKIP" = false ] ; then
 echo ""
 echo "--------------------------------------------------------------------------------"
 echo ""
@@ -182,6 +191,7 @@ case ${answer:0:1} in
     ;;
 esac
 
+fi
 echo ""
 echo "--------------------------------------------------------------------------------"
 echo ""
diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/.env.sample b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/.env.sample
index ff10bb35..f8bb1522 100644
--- a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/.env.sample
+++ b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/.env.sample
@@ -243,6 +243,10 @@
 # SERVICES_RENDERING_VIDEO_RESOLUTIONS=240,720,1080
 # SERVICES_RENDERING_VIDEO_DEFAULT_RESOLUTION=720
 
+# --- time untile the h5p cache is used instead of direct requests
+# mainly used on persistency issues (e.g. slow hdd's)
+# SERVICES_RENDERING_H5P_DISABLE_CACHE_DELAY=0
+
 ########################################################################################################################
 # ONLY FOR DEBUGGING
 ########################################################################################################################
diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/README.md b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/README.md
index 2bb388a2..029e102b 100644
--- a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/README.md
+++ b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/README.md
@@ -3,8 +3,7 @@
 #set( $symbol_escape = '\' )
 ${symbol_pound} ${rootArtifactId} - deploy docker
 
-Prerequisites
--------------
+## Prerequisites
 
 - Docker Engine 18.06.0+
 - Apache Maven 3.8.4+
@@ -12,8 +11,7 @@ Prerequisites
 - PHP Framework 7.4 (<8)
 - Git SCM
 
-Install
--------
+## Install
 
 1. Please login with your credentials (if necessary):
 
@@ -33,8 +31,7 @@ Install
    ./deploy.sh info
    ```
 
-Build
------
+## Build
 
 1. Please add following elements to `${symbol_dollar}HOME/.m2/settings.xml` 
 
@@ -66,8 +63,7 @@ Build
    mvn clean install
    ```
 
-Test
-----
+## Test
 
 1. [Build](#build) local docker images first.
 
@@ -95,8 +91,7 @@ Test
    ./deploy.sh logs
    ```
 
-Debugging
----------
+## Debugging
 
 1. [Build](#build) local docker images first.
 
@@ -138,8 +133,7 @@ Debugging
      ./deploy.sh reload edu-sharing
      ```
 
-Uninstall
----------
+## Uninstall
 
 1. Shut down an instance by calling:
 
@@ -153,6 +147,9 @@ Uninstall
    ./deploy.sh remove
    ```
 
+## Parameters
+
+
 ---
 If you need more information, please consult
 our [edu-sharing community sdk](https://scm.edu-sharing.com/edu-sharing-community/edu-sharing-community-sdk) project.
diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/.env.sample b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/.env.sample
index 556c20ed..9f49e16d 100644
--- a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/.env.sample
+++ b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/.env.sample
@@ -114,6 +114,9 @@
 # --- relative login path from external authentication service
 # REPOSITORY_SERVICE_AUTH_EXTERNAL_LOGIN=/shibboleth
 
+# --- Shall the url of the repository be dynamically returned based on the input url (useful for multi-domain contexts)
+# REPOSITORY_SERVICE_HOME_URL_DYNAMIC=false
+
 # --- absolut path from external authentication provider
 # REPOSITORY_SERVICE_HOME_AUTH_EXTERNAL_LOGIN_PROVIDERS_URL=
 
@@ -263,6 +266,11 @@
 # SERVICES_RENDERING_VIDEO_TIMEOUT=3600
 # SERVICES_RENDERING_VIDEO_THREADS=1
 
+# --- time untile the h5p cache is used instead of direct requests
+# mainly used on persistency issues (e.g. slow hdd's)
+# SERVICES_RENDERING_H5P_DISABLE_CACHE_DELAY=0
+
+
 ########################################################################################################################
 # ONLY FOR DEBUGGING
 ########################################################################################################################
diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/utils.sh b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/utils.sh
index f5a051fd..fa0bda7b 100755
--- a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/utils.sh
+++ b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/compose/src/main/scripts/utils.sh
@@ -338,13 +338,13 @@ backup() {
     echo "backup postgres"
 
     if [[ -n $compressed ]] ; then
-      $COMPOSE_EXEC exec -t repository-database sh -c "export PGPASSWORD=${REPOSITORY_DATABASE_PASS:-repository}; pg_dump --format custom --no-owner --no-privileges ${REPOSITORY_DATABASE_NAME:-repository} | gzip" >"$backupDir/repository-db.gz" || {
+      $COMPOSE_EXEC exec -t repository-database sh -c "export PGPASSWORD=${REPOSITORY_DATABASE_PASS:-repository}; pg_dump --username ${REPOSITORY_DATABASE_USER:-repository} --format custom --no-owner --no-privileges ${REPOSITORY_DATABASE_NAME:-repository} | gzip" >"$backupDir/repository-db.gz" || {
         rm -rf "$backupDir"
         echo "ERROR on creating postgres dump"
         exit 1
       }
     else
-      $COMPOSE_EXEC exec -t repository-database sh -c "export PGPASSWORD=${REPOSITORY_DATABASE_PASS:-repository}; pg_dump --format custom --no-owner --no-privileges ${REPOSITORY_DATABASE_NAME:-repository}" > "$backupDir/repository-db.sql" || {
+      $COMPOSE_EXEC exec -t repository-database sh -c "export PGPASSWORD=${REPOSITORY_DATABASE_PASS:-repository}; pg_dump --username ${REPOSITORY_DATABASE_USER:-repository} --format custom --no-owner --no-privileges ${REPOSITORY_DATABASE_NAME:-repository}" > "$backupDir/repository-db.sql" || {
         rm -rf "$backupDir"
         echo "ERROR on creating postgres dump"
         exit 1
diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/helm/src/main/chart/README.md b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/helm/src/main/chart/README.md
new file mode 100644
index 00000000..bbdfb976
--- /dev/null
+++ b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/helm/src/main/chart/README.md
@@ -0,0 +1,42 @@
+## Parameters
+
+### Global parameters
+
+| Name                                    | Description                          | Value   |
+| --------------------------------------- | ------------------------------------ | ------- |
+| `global.cluster.istio.enabled`          | Enable Istio Service mesh            | `false` |
+| `global.metrics.prometheus.enabled`     | Enable global prometheus metrics     | `false` |
+| `global.metrics.prometheus.retention`   | Set prometheus metric retention time | `1w`    |
+| `global.metrics.scrape.interval`        | Set prometheus scrape interval       | `10s`   |
+| `global.metrics.scrape.timeout`         | Set prometheus scrape timeout        | `10s`   |
+| `global.metrics.servicemonitor.enabled` | Enable metrics service monitor       | `false` |
+
+### Local parameters
+
+| Name                                                                                         | Description                                        | Value                                                        |
+| -------------------------------------------------------------------------------------------- | -------------------------------------------------- | ------------------------------------------------------------ |
+| `nameOverride`                                                                               | Override name                                      | `edusharing`                                                 |
+| `image.pullSecrets`                                                                          | How to pull secrets                                | `[]`                                                         |
+| `edusharing_rediscluster.enabled`                                                            | Enable edusharing rediscluster                     | `true`                                                       |
+| `edusharing_rediscluster.nameOverride`                                                       | Override edusharing rediscluster name              | `edusharing-rediscluster`                                    |
+| `edusharing_rediscluster.image.name`                                                         | Set rediscluster image name                        | `${docker.edu_sharing.community.common.redis-cluster.name}`  |
+| `edusharing_rediscluster.image.tag`                                                          | Set rediscluster image tag                         | `${docker.edu_sharing.community.common.redis-cluster.tag}`   |
+| `edusharing_rediscluster.service.port.api`                                                   | Set port for rediscluster service api              | `6379`                                                       |
+| `edusharing_rediscluster.init.permission.image.name`                                         | Set rediscluster init image name                   | `${docker.edu_sharing.community.common.minideb.name}`        |
+| `edusharing_rediscluster.init.permission.image.tag`                                          | Set rediscluster init image tag                    | `${docker.edu_sharing.community.common.minideb.tag}`         |
+| `edusharing_rediscluster.init.sysctl.image.name`                                             | Set rediscluster init sysctl image name            | `${docker.edu_sharing.community.common.minideb.name}`        |
+| `edusharing_rediscluster.init.sysctl.image.tag`                                              | Set rediscluster init sysctl image tag             | `${docker.edu_sharing.community.common.minideb.tag}`         |
+| `edusharing_rediscluster.sidecar.metrics.image.name`                                         | Set rediscluster sidecar metrics image name        | `${docker.edu_sharing.community.common.redis.exporter.name}` |
+| `edusharing_rediscluster.sidecar.metrics.image.tag`                                          | Set rediscluster sidecar metrics image tag         | `${docker.edu_sharing.community.common.redis.exporter.tag}`  |
+| `edusharing_repository.enabled`                                                              | Enable repository                                  | `true`                                                       |
+| `edusharing_repository.edusharing_repository_rediscluster.enabled`                           | Enable repository rediscluster                     | `false`                                                      |
+| `edusharing_repository.edusharing_repository_service.nameOverride`                           | Override repository service name                   | `edusharing-repository-service`                              |
+| `edusharing_repository.edusharing_repository_service.service.port.api.internal`              | Set internal repository service api port           | `8080`                                                       |
+| `edusharing_repository.edusharing_repository_service.config.cache.host`                      | Set host for repository service redis config cache | `edusharing-rediscluster`                                    |
+| `edusharing_repository.edusharing_repository_service.config.cache.port`                      | Set port for repository service redis config cache | `6379`                                                       |
+| `edusharing_services_rendering.enabled`                                                      | Enable rendering service                           | `true`                                                       |
+| `edusharing_services_rendering.edusharing_services_rendering_rediscluster.enabled`           | Enable rediscluster rendering service              | `false`                                                      |
+| `edusharing_services_rendering.edusharing_services_rendering_service.config.cache.host`      | Set host for rendering service cache               | `edusharing-rediscluster`                                    |
+| `edusharing_services_rendering.edusharing_services_rendering_service.config.cache.port`      | Set port for rendering service cache               | `6379`                                                       |
+| `edusharing_services_rendering.edusharing_services_rendering_service.config.repository.host` | Set host for rendering service repository          | `edusharing-repository-service`                              |
+| `edusharing_services_rendering.edusharing_services_rendering_service.config.repository.port` | Set port for rendering service repository          | `8080`                                                       |
diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/helm/src/main/chart/values.yaml b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/helm/src/main/chart/values.yaml
index 38def75a..45684b26 100644
--- a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/helm/src/main/chart/values.yaml
+++ b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/helm/src/main/chart/values.yaml
@@ -2,35 +2,49 @@
 # GLOBAL
 ########################################################################################################################
 
+## @section Global parameters
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
 global:
 
   cluster:
 
     istio:
+      ## @param global.cluster.istio.enabled Enable Istio Service mesh
       enabled: false
 
   metrics:
     prometheus:
+      ## @param global.metrics.prometheus.enabled Enable global prometheus metrics
       enabled: false
+      ## @param global.metrics.prometheus.retention Set prometheus metric retention time
       retention: 1w
     scrape:
+      ## @param global.metrics.scrape.interval Set prometheus scrape interval
       interval: 10s
+      ## @param global.metrics.scrape.timeout Set prometheus scrape timeout
       timeout: 10s
     servicemonitor:
+      ## @param global.metrics.servicemonitor.enabled Enable metrics service monitor
       enabled: false
 
 ########################################################################################################################
 # LOCAL
 ########################################################################################################################
 
+## @section Local parameters
+## @param nameOverride Override name
 nameOverride: edusharing
 
 image:
+  ## @param image.pullSecrets How to pull secrets
+  ## e.g.:
+  ## pullSecrets:
+  ##  - name: registry
+  ##    server: docker.edu-sharing.com
+  ##    username: someone
+  ##    password: secret
   pullSecrets: []
-#  - name: registry
-#    server: docker.edu-sharing.com
-#    username: someone
-#    password: secret
 
 ########################################################################################################################
 # DEPENDENCY
@@ -38,16 +52,21 @@ image:
 
 edusharing_rediscluster:
 
+  ## @param edusharing_rediscluster.enabled Enable edusharing rediscluster
   enabled: true
 
+  ## @param edusharing_rediscluster.nameOverride Override edusharing rediscluster name
   nameOverride: &redisclusterNameOverride edusharing-rediscluster
 
   image:
+    ## @param edusharing_rediscluster.image.name Set rediscluster image name
     name: ${docker.edu_sharing.community.common.redis-cluster.name}
+    ## @param edusharing_rediscluster.image.tag Set rediscluster image tag
     tag: ${docker.edu_sharing.community.common.redis-cluster.tag}
 
   service:
     port:
+      ## @param edusharing_rediscluster.service.port.api Set port for rediscluster service api
       api: &redisclusterServicePortApi 6379
 
   init:
@@ -55,13 +74,17 @@ edusharing_rediscluster:
     permission:
 
       image:
+        ## @param edusharing_rediscluster.init.permission.image.name Set rediscluster init image name
         name: ${docker.edu_sharing.community.common.minideb.name}
+        ## @param edusharing_rediscluster.init.permission.image.tag Set rediscluster init image tag
         tag: ${docker.edu_sharing.community.common.minideb.tag}
 
     sysctl:
 
       image:
+        ## @param edusharing_rediscluster.init.sysctl.image.name Set rediscluster init sysctl image name
         name: ${docker.edu_sharing.community.common.minideb.name}
+        ## @param edusharing_rediscluster.init.sysctl.image.tag Set rediscluster init sysctl image tag
         tag: ${docker.edu_sharing.community.common.minideb.tag}
 
   sidecar:
@@ -69,42 +92,53 @@ edusharing_rediscluster:
     metrics:
 
       image:
+        ## @param edusharing_rediscluster.sidecar.metrics.image.name Set rediscluster sidecar metrics image name
         name: ${docker.edu_sharing.community.common.redis.exporter.name}
+        ## @param edusharing_rediscluster.sidecar.metrics.image.tag Set rediscluster sidecar metrics image tag
         tag: ${docker.edu_sharing.community.common.redis.exporter.tag}
 
 ########################################################################################################################
 
 edusharing_repository:
 
+  ## @param edusharing_repository.enabled Enable repository
   enabled: true
 
   edusharing_repository_rediscluster:
 
+    ## @param edusharing_repository.edusharing_repository_rediscluster.enabled Enable repository rediscluster
     enabled: false
 
   edusharing_repository_service:
 
+    ## @param edusharing_repository.edusharing_repository_service.nameOverride Override repository service name
     nameOverride: &repositoryNameOverride edusharing-repository-service
 
     service:
       port:
         api:
+          ## @param edusharing_repository.edusharing_repository_service.service.port.api.internal Set internal repository service api port
           internal: &repositoryServicePostApiInternal 8080
 
     config:
 
       cache:
+        ## @param edusharing_repository.edusharing_repository_service.config.cache.host Set host for repository service redis config cache
         host: *redisclusterNameOverride
+        ## @param edusharing_repository.edusharing_repository_service.config.cache.port Set port for repository service redis config cache
         port: *redisclusterServicePortApi
 
+
 ########################################################################################################################
 
 edusharing_services_rendering:
 
+  ## @param edusharing_services_rendering.enabled Enable rendering service
   enabled: true
 
   edusharing_services_rendering_rediscluster:
 
+    ## @param edusharing_services_rendering.edusharing_services_rendering_rediscluster.enabled Enable rediscluster rendering service
     enabled: false
 
   edusharing_services_rendering_service:
@@ -112,11 +146,15 @@ edusharing_services_rendering:
     config:
 
       cache:
+        ## @param edusharing_services_rendering.edusharing_services_rendering_service.config.cache.host Set host for rendering service cache
         host: *redisclusterNameOverride
+        ## @param edusharing_services_rendering.edusharing_services_rendering_service.config.cache.port Set port for rendering service cache
         port: *redisclusterServicePortApi
 
       repository:
+        ## @param edusharing_services_rendering.edusharing_services_rendering_service.config.repository.host Set host for rendering service repository
         host: *repositoryNameOverride
+        ## @param edusharing_services_rendering.edusharing_services_rendering_service.config.repository.port Set port for rendering service repository
         port: *repositoryServicePostApiInternal
 
 ########################################################################################################################
diff --git a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/pom.xml b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/pom.xml
index 12b4c288..e467f1e4 100644
--- a/archetypes/project/src/main/resources/archetype-resources/deploy/docker/pom.xml
+++ b/archetypes/project/src/main/resources/archetype-resources/deploy/docker/pom.xml
@@ -31,7 +31,7 @@
     </docker.edu_sharing.community.common.redis.exporter.name>
 
     <docker.edu_sharing.community.common.redis.exporter.tag>
-      1.45.0
+      1.59.0
     </docker.edu_sharing.community.common.redis.exporter.tag>
 
     <docker.edu_sharing.community.common.redis-cluster.name>
@@ -39,10 +39,10 @@
     </docker.edu_sharing.community.common.redis-cluster.name>
 
     <docker.edu_sharing.community.common.redis-cluster.tag>
-      6.2.7
+      6.2.14
     </docker.edu_sharing.community.common.redis-cluster.tag>
 
-    <helm.kube.version>&gt;= 1.20.0</helm.kube.version>
+    <helm.kube.version>&gt;= 1.20.0-0</helm.kube.version>
     <helm.version>3.14.2</helm.version>
 
   </properties>
diff --git a/archetypes/project/src/main/resources/archetype-resources/repository/Backend/services/core/pom.xml b/archetypes/project/src/main/resources/archetype-resources/repository/Backend/services/core/pom.xml
index 6745eef8..662dccc7 100644
--- a/archetypes/project/src/main/resources/archetype-resources/repository/Backend/services/core/pom.xml
+++ b/archetypes/project/src/main/resources/archetype-resources/repository/Backend/services/core/pom.xml
@@ -106,6 +106,20 @@
       <artifactId>lombok</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>1.16.3</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.8.2</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <profiles>
diff --git a/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/helm/src/main/chart/README.md b/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/helm/src/main/chart/README.md
new file mode 100644
index 00000000..d0435ee0
--- /dev/null
+++ b/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/helm/src/main/chart/README.md
@@ -0,0 +1,105 @@
+## Parameters
+
+### Global parameters
+
+| Name                  | Description                            | Value                              |
+| --------------------- | -------------------------------------- | ---------------------------------- |
+| `global.patroni.name` | Override Postgres Zalando Patroni name | `edusharing-repository-postgresql` |
+
+### Local parameters
+
+| Name           | Description              | Value                   |
+| -------------- | ------------------------ | ----------------------- |
+| `nameOverride` | Override repository name | `edusharing-repository` |
+
+### Dependency
+
+| Name                                                                      | Description                                            | Value                                                             |
+| ------------------------------------------------------------------------- | ------------------------------------------------------ | ----------------------------------------------------------------- |
+| `edusharing_repository_antivirus.enabled`                                 | Enable antivirus repository                            | `${helm.edusharing_repository_antivirus.enabled}`                 |
+| `edusharing_repository_antivirus.nameOverride`                            | Override antivirus repository name                     | `edusharing-repository-antivirus`                                 |
+| `edusharing_repository_antivirus.service.port.api`                        | Set port for antivirus repository service api          | `1344`                                                            |
+| `edusharing_repository_postgresql.enabled`                                | Enable postgresql repository                           | `true`                                                            |
+| `edusharing_repository_postgresql.nameOverride`                           | Override postgresql repository name                    | `edusharing-repository-postgresql`                                |
+| `edusharing_repository_postgresql.image.name`                             | Set postgresql repository image name                   | `${docker.edu_sharing.community.common.postgresql.name}`          |
+| `edusharing_repository_postgresql.image.tag`                              | Set postgresql repository image tag                    | `${docker.edu_sharing.community.common.postgresql.tag}`           |
+| `edusharing_repository_postgresql.service.port.api`                       | Set postgresql repository service api port             | `5432`                                                            |
+| `edusharing_repository_postgresql.config.database`                        | Set postgresql repository database                     | `repository`                                                      |
+| `edusharing_repository_postgresql.config.username`                        | Set postgresql repository username                     | `repository`                                                      |
+| `edusharing_repository_postgresql.init.permission.image.name`             | Set postgresql repository init permission image name   | `${docker.edu_sharing.community.common.minideb.name}`             |
+| `edusharing_repository_postgresql.init.permission.image.tag`              | Set postgresql repository init permission image tag    | `${docker.edu_sharing.community.common.minideb.tag}`              |
+| `edusharing_repository_postgresql.job.dump.image.name`                    | Set postgresql repository job dump image name          | `${docker.edu_sharing.community.common.postgresql.name}`          |
+| `edusharing_repository_postgresql.job.dump.image.tag`                     | Set postgresql repository job dump image tag           | `${docker.edu_sharing.community.common.postgresql.tag}`           |
+| `edusharing_repository_postgresql.sidecar.metrics.image.name`             | Set postgresql repository sidecar metrics image name   | `${docker.edu_sharing.community.common.postgresql.exporter.name}` |
+| `edusharing_repository_postgresql.sidecar.metrics.image.tag`              | Set postgresql repository sidecar metrics image tag    | `${docker.edu_sharing.community.common.postgresql.exporter.tag}`  |
+| `edusharing_repository_rediscluster.enabled`                              | Enable rediscluster repository                         | `true`                                                            |
+| `edusharing_repository_rediscluster.nameOverride`                         | Override repository rediscluster name                  | `edusharing-repository-rediscluster`                              |
+| `edusharing_repository_rediscluster.image.name`                           | Set repository rediscluster image name                 | `${docker.edu_sharing.community.common.redis-cluster.name}`       |
+| `edusharing_repository_rediscluster.image.tag`                            | Set repository rediscluster image tag                  | `${docker.edu_sharing.community.common.redis-cluster.tag}`        |
+| `edusharing_repository_rediscluster.service.port.api`                     | Set port of rediscluster repository service api        | `6379`                                                            |
+| `edusharing_repository_rediscluster.init.permission.image.name`           | Set rediscluster repository permission image name      | `${docker.edu_sharing.community.common.minideb.name}`             |
+| `edusharing_repository_rediscluster.init.permission.image.tag`            | Set rediscluster repository permission image tag       | `${docker.edu_sharing.community.common.minideb.tag}`              |
+| `edusharing_repository_rediscluster.init.sysctl.image.name`               | Set rediscluster repository sysctl image name          | `${docker.edu_sharing.community.common.minideb.name}`             |
+| `edusharing_repository_rediscluster.init.sysctl.image.tag`                | Set rediscluster repository sysctl image tag           | `${docker.edu_sharing.community.common.minideb.tag}`              |
+| `edusharing_repository_rediscluster.sidecar.metrics.image.name`           | Set rediscluster repository metrics sidecar image name | `${docker.edu_sharing.community.common.redis.exporter.name}`      |
+| `edusharing_repository_rediscluster.sidecar.metrics.image.tag`            | Set rediscluster repository metrics sidecar image tag  | `${docker.edu_sharing.community.common.redis.exporter.tag}`       |
+| `edusharing_repository_mongo.enabled`                                     | Enable mongo repository                                | `${helm.edusharing_repository_mongo.enabled}`                     |
+| `edusharing_repository_mongo.nameOverride`                                | Override mongo repository name                         | `edusharing-repository-mongo`                                     |
+| `edusharing_repository_mongo.service.port.api`                            | Set mongo repository service api port                  | `27017`                                                           |
+| `edusharing_repository_mongo.config.database`                             | Set mongo repository database                          | `repository`                                                      |
+| `edusharing_repository_mongo.config.username`                             | Set mongo repository username                          | `repository`                                                      |
+| `edusharing_repository_search_elastic_index.enabled`                      | Enable search elastic index repository                 | `${helm.edusharing_repository_search_elastic_index.enabled}`      |
+| `edusharing_repository_search_elastic_index.nameOverride`                 | Override search elastic index repository name          | `edusharing-repository-search-elastic-index`                      |
+| `edusharing_repository_search_elastic_index.service.port.api`             | Set search elastic index repository service api port   | `9200`                                                            |
+| `edusharing_repository_search_solr.enabled`                               | Enable search solr repository                          | `true`                                                            |
+| `edusharing_repository_search_solr.nameOverride`                          | Override search solr repository name                   | `edusharing-repository-search-solr`                               |
+| `edusharing_repository_search_solr.service.port.api`                      | Set search solr repository service api port            | `9200`                                                            |
+| `edusharing_repository_search_solr.config.repository.host`                | Set search solr repository host                        | `edusharing-repository-service`                                   |
+| `edusharing_repository_search_solr.config.repository.port`                | Set search solr repository port                        | `8080`                                                            |
+| `edusharing_repository_transform.enabled`                                 | Enable transform repository                            | `${helm.edusharing_repository_transform.enabled}`                 |
+| `edusharing_repository_transform.nameOverride`                            | Override transform repository name                     | `edusharing-repository-transform`                                 |
+| `edusharing_repository_transform.service.port.api`                        | Set port of transform repository service api           | `8080`                                                            |
+| `edusharing_repository_transform_aio.enabled`                             | Enable transform_aio repository                        | `true`                                                            |
+| `edusharing_repository_transform_aio.nameOverride`                        | Override transform_aio repository name                 | `edusharing-repository-transform-aio`                             |
+| `edusharing_repository_transform_aio.service.port.api`                    | Set port of transform_aio repository service api       | `8090`                                                            |
+| `edusharing_repository_transform_es.enabled`                              | Enable transform_es repository                         | `true`                                                            |
+| `edusharing_repository_transform_es.nameOverride`                         | Override transform_es repository name                  | `edusharing-repository-transform-es`                              |
+| `edusharing_repository_transform_es.service.port.api`                     | Set port for transform_aes repository service api      | `8091`                                                            |
+| `edusharing_repository_service.enabled`                                   | Enable repository service                              | `true`                                                            |
+| `edusharing_repository_service.nameOverride`                              | Override repository service name                       | `edusharing-repository-service`                                   |
+| `edusharing_repository_service.image.repository`                          | Set repository service image repository                | `${docker.repository}`                                            |
+| `edusharing_repository_service.image.name`                                | Set repository service image name                      | `${docker.prefix}-deploy-docker-build-repository-service`         |
+| `edusharing_repository_service.image.tag`                                 | Set repository service image tag                       | `${docker.tag}`                                                   |
+| `edusharing_repository_service.service.port.api.internal`                 | Set port for repository service internal service api   | `8080`                                                            |
+| `edusharing_repository_service.config.antivirus.enabled`                  | Enable repository service antivirus                    | `${helm.edusharing_repository_antivirus.enabled}`                 |
+| `edusharing_repository_service.config.antivirus.host`                     | Set host for repository service antivirus              | `edusharing-repository-antivirus`                                 |
+| `edusharing_repository_service.config.antivirus.port`                     | Set port for repository service antivirus              | `1344`                                                            |
+| `edusharing_repository_service.config.cache.host`                         | Set host for repository service cache                  | `edusharing-repository-rediscluster`                              |
+| `edusharing_repository_service.config.cache.port`                         | Set port for repository service cache                  | `6379`                                                            |
+| `edusharing_repository_service.config.cluster.enabled`                    | Enable repository service cluster                      | `${helm.edusharing_repository_cluster.enabled}`                   |
+| `edusharing_repository_service.config.database.host`                      | Set host for repository service database               | `edusharing-repository-postgresql`                                |
+| `edusharing_repository_service.config.database.port`                      | Set port for repository service database               | `5432`                                                            |
+| `edusharing_repository_service.config.database.database`                  | Set repository service database                        | `repository`                                                      |
+| `edusharing_repository_service.config.database.username`                  | Set repository service database username               | `repository`                                                      |
+| `edusharing_repository_service.config.mongo.enabled`                      | Enable repository service mongo                        | `${helm.edusharing_repository_mongo.enabled}`                     |
+| `edusharing_repository_service.config.mongo.host`                         | Set host for repository service mongo                  | `edusharing-repository-mongo`                                     |
+| `edusharing_repository_service.config.mongo.port`                         | Set port for repository service mongo                  | `27017`                                                           |
+| `edusharing_repository_service.config.mongo.database`                     | Set repository service mongo database                  | `repository`                                                      |
+| `edusharing_repository_service.config.mongo.username`                     | Set repository service mongo username                  | `repository`                                                      |
+| `edusharing_repository_service.config.search.elastic.enabled`             | Enable repository service elastic search               | `${helm.edusharing_repository_search_elastic_index.enabled}`      |
+| `edusharing_repository_service.config.search.elastic.host`                | Set host for repository service elastic search         | `edusharing-repository-search-elastic-index`                      |
+| `edusharing_repository_service.config.search.elastic.port`                | Set port for repository service elastic search         | `9200`                                                            |
+| `edusharing_repository_service.config.search.solr.host`                   | Set host for repository service solr search            | `edusharing-repository-search-solr`                               |
+| `edusharing_repository_service.config.search.solr.port`                   | Set port for repository service solr search            | `9200`                                                            |
+| `edusharing_repository_service.config.transform.aio.host`                 | Set host for repository service transform_aio          | `edusharing-repository-transform-aio`                             |
+| `edusharing_repository_service.config.transform.aio.port`                 | Set port for repository service transform_aio          | `8090`                                                            |
+| `edusharing_repository_service.config.transform.es.host`                  | Set host for repository service transform_es           | `edusharing-repository-transform-es`                              |
+| `edusharing_repository_service.config.transform.es.port`                  | Set port for repository service transform_es           | `8091`                                                            |
+| `edusharing_repository_service.config.transform.server.enabled`           | Enable repository service transform server             | `${helm.edusharing_repository_transform.enabled}`                 |
+| `edusharing_repository_service.config.transform.server.host`              | Set host for repository service transform server       | `edusharing-repository-transform`                                 |
+| `edusharing_repository_service.config.transform.server.port`              | Set port for repository service transform server       | `8080`                                                            |
+| `edusharing_repository_search_elastic_tracker.enabled`                    | Enable search repositories elastic tracker             | `${helm.edusharing_repository_search_elastic_tracker.enabled}`    |
+| `edusharing_repository_search_elastic_tracker.config.repository.host`     | Set host of search repositories elastic tracker        | `edusharing-repository-service`                                   |
+| `edusharing_repository_search_elastic_tracker.config.repository.port`     | Set port of search repositories elastic tracker        | `8080`                                                            |
+| `edusharing_repository_search_elastic_tracker.config.search.elastic.host` | Set host of elastic search repository                  | `edusharing-repository-search-elastic-index`                      |
+| `edusharing_repository_search_elastic_tracker.config.search.elastic.port` | Set port of elastic search repository                  | `9200`                                                            |
diff --git a/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/helm/src/main/chart/values.yaml b/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/helm/src/main/chart/values.yaml
index 0b72ab56..7d0592d9 100644
--- a/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/helm/src/main/chart/values.yaml
+++ b/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/helm/src/main/chart/values.yaml
@@ -2,52 +2,70 @@
 # GLOBAL
 ########################################################################################################################
 
+## @section Global parameters
+## Global Docker image parameters
+## Please, note that this will override the image parameters, including dependencies, configured to use the global value
 global:
 
   patroni:
+    ## @param global.patroni.name Override Postgres Zalando Patroni name
     name: &postgresqlNameOverride edusharing-repository-postgresql
 
 ########################################################################################################################
 # LOCAL
 ########################################################################################################################
 
+## @section Local parameters
+## @param nameOverride Override repository name
 nameOverride: edusharing-repository
 
 ########################################################################################################################
 # DEPENDENCY
 ########################################################################################################################
 
+## @section Dependency
+
 edusharing_repository_antivirus:
 
+  ## @param edusharing_repository_antivirus.enabled Enable antivirus repository
   enabled: ${helm.edusharing_repository_antivirus.enabled}
 
+  ## @param edusharing_repository_antivirus.nameOverride Override antivirus repository name
   nameOverride: &antivirusNameOverride edusharing-repository-antivirus
 
   service:
 
     port:
+      ## @param edusharing_repository_antivirus.service.port.api Set port for antivirus repository service api
       api: &antivirusServicePortApi 1344
 
 ########################################################################################################################
 
 edusharing_repository_postgresql:
 
+  ## @param edusharing_repository_postgresql.enabled Enable postgresql repository
   enabled: true
 
+  ## @param edusharing_repository_postgresql.nameOverride Override postgresql repository name
   nameOverride: *postgresqlNameOverride
 
   image:
+    ## @param edusharing_repository_postgresql.image.name Set postgresql repository image name
     name: ${docker.edu_sharing.community.common.postgresql.name}
+    ## @param edusharing_repository_postgresql.image.tag Set postgresql repository image tag
     tag: ${docker.edu_sharing.community.common.postgresql.tag}
 
   service:
 
     port:
+      ## @param edusharing_repository_postgresql.service.port.api Set postgresql repository service api port
       api: &postgresqlServicePortApi 5432
 
   config:
 
+    ## @param edusharing_repository_postgresql.config.database Set postgresql repository database
     database: &postgresqlConfigDatabase repository
+    ## @param edusharing_repository_postgresql.config.username Set postgresql repository username
     username: &postgresqlConfigUsername repository
 
   init:
@@ -55,7 +73,9 @@ edusharing_repository_postgresql:
     permission:
 
       image:
+        ## @param edusharing_repository_postgresql.init.permission.image.name Set postgresql repository init permission image name
         name: ${docker.edu_sharing.community.common.minideb.name}
+        ## @param edusharing_repository_postgresql.init.permission.image.tag Set postgresql repository init permission image tag
         tag: ${docker.edu_sharing.community.common.minideb.tag}
 
   job:
@@ -63,7 +83,9 @@ edusharing_repository_postgresql:
     dump:
 
       image:
+        ## @param edusharing_repository_postgresql.job.dump.image.name Set postgresql repository job dump image name
         name: ${docker.edu_sharing.community.common.postgresql.name}
+        ## @param edusharing_repository_postgresql.job.dump.image.tag Set postgresql repository job dump image tag
         tag: ${docker.edu_sharing.community.common.postgresql.tag}
 
   sidecar:
@@ -71,24 +93,31 @@ edusharing_repository_postgresql:
     metrics:
 
       image:
+        ## @param edusharing_repository_postgresql.sidecar.metrics.image.name Set postgresql repository sidecar metrics image name
         name: ${docker.edu_sharing.community.common.postgresql.exporter.name}
+        ## @param edusharing_repository_postgresql.sidecar.metrics.image.tag Set postgresql repository sidecar metrics image tag
         tag: ${docker.edu_sharing.community.common.postgresql.exporter.tag}
 
 ########################################################################################################################
 
 edusharing_repository_rediscluster:
 
+  ## @param edusharing_repository_rediscluster.enabled Enable rediscluster repository
   enabled: true
 
+  ## @param edusharing_repository_rediscluster.nameOverride Override repository rediscluster name
   nameOverride: &redisclusterNameOverride edusharing-repository-rediscluster
 
   image:
+    ## @param edusharing_repository_rediscluster.image.name Set repository rediscluster image name
     name: ${docker.edu_sharing.community.common.redis-cluster.name}
+    ## @param edusharing_repository_rediscluster.image.tag Set repository rediscluster image tag
     tag: ${docker.edu_sharing.community.common.redis-cluster.tag}
 
   service:
 
     port:
+      ## @param edusharing_repository_rediscluster.service.port.api Set port of rediscluster repository service api
       api: &redisclusterServicePortApi 6379
 
   init:
@@ -96,13 +125,17 @@ edusharing_repository_rediscluster:
     permission:
 
       image:
+        ## @param edusharing_repository_rediscluster.init.permission.image.name Set rediscluster repository permission image name
         name: ${docker.edu_sharing.community.common.minideb.name}
+        ## @param edusharing_repository_rediscluster.init.permission.image.tag Set rediscluster repository permission image tag
         tag: ${docker.edu_sharing.community.common.minideb.tag}
 
     sysctl:
 
       image:
+        ## @param edusharing_repository_rediscluster.init.sysctl.image.name Set rediscluster repository sysctl image name
         name: ${docker.edu_sharing.community.common.minideb.name}
+        ## @param edusharing_repository_rediscluster.init.sysctl.image.tag Set rediscluster repository sysctl image tag
         tag: ${docker.edu_sharing.community.common.minideb.tag}
 
   sidecar:
@@ -110,185 +143,247 @@ edusharing_repository_rediscluster:
     metrics:
 
       image:
+        ## @param edusharing_repository_rediscluster.sidecar.metrics.image.name Set rediscluster repository metrics sidecar image name
         name: ${docker.edu_sharing.community.common.redis.exporter.name}
+        ## @param edusharing_repository_rediscluster.sidecar.metrics.image.tag Set rediscluster repository metrics sidecar image tag
         tag: ${docker.edu_sharing.community.common.redis.exporter.tag}
 
 ########################################################################################################################
 
 edusharing_repository_mongo:
 
+  ## @param edusharing_repository_mongo.enabled Enable mongo repository
   enabled: ${helm.edusharing_repository_mongo.enabled}
 
+  ## @param edusharing_repository_mongo.nameOverride Override mongo repository name
   nameOverride: &mongoNameOverride edusharing-repository-mongo
 
   service:
 
     port:
+      ## @param edusharing_repository_mongo.service.port.api Set mongo repository service api port
       api: &mongoServicePortApi 27017
 
   config:
 
+    ## @param edusharing_repository_mongo.config.database Set mongo repository database
     database: &mongoConfigDatabase repository
+    ## @param edusharing_repository_mongo.config.username Set mongo repository username
     username: &mongoConfigUsername repository
 
 ########################################################################################################################
 
 edusharing_repository_search_elastic_index:
 
+  ## @param edusharing_repository_search_elastic_index.enabled Enable search elastic index repository
   enabled: ${helm.edusharing_repository_search_elastic_index.enabled}
 
+  ## @param edusharing_repository_search_elastic_index.nameOverride Override search elastic index repository name
   nameOverride: &searchElasticNameOverride edusharing-repository-search-elastic-index
 
   service:
 
     port:
+      ## @param edusharing_repository_search_elastic_index.service.port.api Set search elastic index repository service api port
       api: &searchElasticServicePortApi 9200
 
 ########################################################################################################################
 
 edusharing_repository_search_solr:
 
+  ## @param edusharing_repository_search_solr.enabled Enable search solr repository
   enabled: true
 
+  ## @param edusharing_repository_search_solr.nameOverride Override search solr repository name
   nameOverride: &searchSolrNameOverride edusharing-repository-search-solr
 
   service:
 
     port:
+      ## @param edusharing_repository_search_solr.service.port.api Set search solr repository service api port
       api: &searchSolrServicePortApi 9200
 
   config:
 
     repository:
+      ## @param edusharing_repository_search_solr.config.repository.host Set search solr repository host
       host: &serviceNameOverride edusharing-repository-service
+      ## @param edusharing_repository_search_solr.config.repository.port Set search solr repository port
       port: &serviceServicePortApiInternal 8080
 
 ########################################################################################################################
 
 edusharing_repository_transform:
 
+  ## @param edusharing_repository_transform.enabled Enable transform repository
   enabled: ${helm.edusharing_repository_transform.enabled}
 
+  ## @param edusharing_repository_transform.nameOverride Override transform repository name
   nameOverride: &transformNameOverride edusharing-repository-transform
 
   service:
 
     port:
+      ## @param edusharing_repository_transform.service.port.api Set port of transform repository service api
       api: &transformServicePortApi 8080
 
 ########################################################################################################################
 
 edusharing_repository_transform_aio:
 
+  ## @param edusharing_repository_transform_aio.enabled Enable transform_aio repository
   enabled: true
 
+  ## @param edusharing_repository_transform_aio.nameOverride Override transform_aio repository name
   nameOverride: &transformAIONameOverride edusharing-repository-transform-aio
 
   service:
 
     port:
+      ## @param edusharing_repository_transform_aio.service.port.api Set port of transform_aio repository service api
       api: &transformAIOServicePortApi 8090
 
 ########################################################################################################################
 
 edusharing_repository_transform_es:
 
+  ## @param edusharing_repository_transform_es.enabled Enable transform_es repository
   enabled: true
 
+  ## @param edusharing_repository_transform_es.nameOverride Override transform_es repository name
   nameOverride: &transformESNameOverride edusharing-repository-transform-es
 
   service:
 
     port:
+      ## @param edusharing_repository_transform_es.service.port.api Set port for transform_aes repository service api
       api: &transformESServicePortApi 8091
 
 ########################################################################################################################
 
 edusharing_repository_service:
 
+  ## @param edusharing_repository_service.enabled Enable repository service
   enabled: true
 
+  ## @param edusharing_repository_service.nameOverride Override repository service name
   nameOverride: *serviceNameOverride
 
   image:
+    ## @param edusharing_repository_service.image.repository Set repository service image repository
     repository: ${docker.repository}
+    ## @param edusharing_repository_service.image.name Set repository service image name
     name: ${docker.prefix}-deploy-docker-build-repository-service
+    ## @param edusharing_repository_service.image.tag Set repository service image tag
     tag: ${docker.tag}
 
   service:
 
     port:
       api:
+        ## @param edusharing_repository_service.service.port.api.internal Set port for repository service internal service api
         internal: *serviceServicePortApiInternal
 
   config:
 
     antivirus:
+      ## @param edusharing_repository_service.config.antivirus.enabled Enable repository service antivirus
       enabled: ${helm.edusharing_repository_antivirus.enabled}
+      ## @param edusharing_repository_service.config.antivirus.host Set host for repository service antivirus
       host: *antivirusNameOverride
+      ## @param edusharing_repository_service.config.antivirus.port Set port for repository service antivirus
       port: *antivirusServicePortApi
 
     cache:
+      ## @param edusharing_repository_service.config.cache.host Set host for repository service cache
       host: *redisclusterNameOverride
+      ## @param edusharing_repository_service.config.cache.port Set port for repository service cache
       port: *redisclusterServicePortApi
 
     cluster:
+      ## @param edusharing_repository_service.config.cluster.enabled Enable repository service cluster
       enabled: ${helm.edusharing_repository_cluster.enabled}
 
     database:
+      ## @param edusharing_repository_service.config.database.host Set host for repository service database
       host: *postgresqlNameOverride
+      ## @param edusharing_repository_service.config.database.port Set port for repository service database
       port: *postgresqlServicePortApi
+      ## @param edusharing_repository_service.config.database.database Set repository service database
       database: *postgresqlConfigDatabase
+      ## @param edusharing_repository_service.config.database.username Set repository service database username
       username: *postgresqlConfigUsername
 
     mongo:
+      ## @param edusharing_repository_service.config.mongo.enabled Enable repository service mongo
       enabled: ${helm.edusharing_repository_mongo.enabled}
+      ## @param edusharing_repository_service.config.mongo.host Set host for repository service mongo
       host: *mongoNameOverride
+      ## @param edusharing_repository_service.config.mongo.port Set port for repository service mongo
       port: *mongoServicePortApi
+      ## @param edusharing_repository_service.config.mongo.database Set repository service mongo database
       database: *mongoConfigDatabase
+      ## @param edusharing_repository_service.config.mongo.username Set repository service mongo username
       username: *mongoConfigUsername
 
     search:
 
       elastic:
+        ## @param edusharing_repository_service.config.search.elastic.enabled Enable repository service elastic search
         enabled: ${helm.edusharing_repository_search_elastic_index.enabled}
+        ## @param edusharing_repository_service.config.search.elastic.host Set host for repository service elastic search
         host: *searchElasticNameOverride
+        ## @param edusharing_repository_service.config.search.elastic.port Set port for repository service elastic search
         port: *searchElasticServicePortApi
 
       solr:
+        ## @param edusharing_repository_service.config.search.solr.host Set host for repository service solr search
         host: *searchSolrNameOverride
+        ## @param edusharing_repository_service.config.search.solr.port Set port for repository service solr search
         port: *searchSolrServicePortApi
 
     transform:
 
       aio:
+        ## @param edusharing_repository_service.config.transform.aio.host Set host for repository service transform_aio
         host: *transformAIONameOverride
+        ## @param edusharing_repository_service.config.transform.aio.port Set port for repository service transform_aio
         port: *transformAIOServicePortApi
 
       es:
+        ## @param edusharing_repository_service.config.transform.es.host Set host for repository service transform_es
         host: *transformESNameOverride
+        ## @param edusharing_repository_service.config.transform.es.port Set port for repository service transform_es
         port: *transformESServicePortApi
 
       server:
+        ## @param edusharing_repository_service.config.transform.server.enabled Enable repository service transform server
         enabled: ${helm.edusharing_repository_transform.enabled}
+        ## @param edusharing_repository_service.config.transform.server.host Set host for repository service transform server
         host: *transformNameOverride
+        ## @param edusharing_repository_service.config.transform.server.port Set port for repository service transform server
         port: *transformServicePortApi
 
 ########################################################################################################################
 
 edusharing_repository_search_elastic_tracker:
 
+  ## @param edusharing_repository_search_elastic_tracker.enabled Enable search repositories elastic tracker
   enabled: ${helm.edusharing_repository_search_elastic_tracker.enabled}
 
   config:
 
     repository:
+      ## @param edusharing_repository_search_elastic_tracker.config.repository.host Set host of search repositories elastic tracker
       host: *serviceNameOverride
+      ## @param edusharing_repository_search_elastic_tracker.config.repository.port Set port of search repositories elastic tracker
       port: *serviceServicePortApiInternal
 
     search:
       elastic:
+        ## @param edusharing_repository_search_elastic_tracker.config.search.elastic.host Set host of elastic search repository
         host: *searchElasticNameOverride
+        ## @param edusharing_repository_search_elastic_tracker.config.search.elastic.port Set port of elastic search repository
         port: *searchElasticServicePortApi
 
 ########################################################################################################################
diff --git a/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/pom.xml b/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/pom.xml
index 9d1e14a9..84cbe432 100644
--- a/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/pom.xml
+++ b/archetypes/project/src/main/resources/archetype-resources/repository/deploy/docker/pom.xml
@@ -31,7 +31,7 @@
     </docker.edu_sharing.community.common.postgresql.name>
 
     <docker.edu_sharing.community.common.postgresql.tag>
-      13.9.0
+      13.15.0
     </docker.edu_sharing.community.common.postgresql.tag>
 
     <docker.edu_sharing.community.common.postgresql.exporter.name>
@@ -39,7 +39,7 @@
     </docker.edu_sharing.community.common.postgresql.exporter.name>
 
     <docker.edu_sharing.community.common.postgresql.exporter.tag>
-      0.11.1
+      0.15.0
     </docker.edu_sharing.community.common.postgresql.exporter.tag>
 
     <docker.edu_sharing.community.common.redis.exporter.name>
@@ -47,7 +47,7 @@
     </docker.edu_sharing.community.common.redis.exporter.name>
 
     <docker.edu_sharing.community.common.redis.exporter.tag>
-      1.45.0
+      1.59.0
     </docker.edu_sharing.community.common.redis.exporter.tag>
 
     <docker.edu_sharing.community.common.redis-cluster.name>
@@ -55,10 +55,10 @@
     </docker.edu_sharing.community.common.redis-cluster.name>
 
     <docker.edu_sharing.community.common.redis-cluster.tag>
-      6.2.7
+      6.2.14
     </docker.edu_sharing.community.common.redis-cluster.tag>
 
-    <helm.kube.version>&gt;= 1.20.0</helm.kube.version>
+    <helm.kube.version>&gt;= 1.20.0-0</helm.kube.version>
     <helm.version>3.14.2</helm.version>
 
   </properties>
diff --git a/archetypes/project/src/main/resources/archetype-resources/repository/webapp/src/main/templates/WEB-INF/classes/version.json b/archetypes/project/src/main/resources/archetype-resources/repository/webapp/src/main/templates/WEB-INF/classes/version.json
index 3f0c2e2d..f85e6415 100644
--- a/archetypes/project/src/main/resources/archetype-resources/repository/webapp/src/main/templates/WEB-INF/classes/version.json
+++ b/archetypes/project/src/main/resources/archetype-resources/repository/webapp/src/main/templates/WEB-INF/classes/version.json
@@ -1,4 +1,7 @@
 {
+  "build": {
+    "timestamp": "${build.timestamp}"
+  },
   "git": {
     "branch": "${git.branch}",
     "closest": {
diff --git a/monitoring/dashboards/edusharing.json b/monitoring/dashboards/edusharing.json
index 4cf5b409..b8bbbe31 100644
--- a/monitoring/dashboards/edusharing.json
+++ b/monitoring/dashboards/edusharing.json
@@ -9596,7 +9596,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\"}) by (pod)",
+              "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\"}) by (pod)",
               "interval": "",
               "legendFormat": "{{pod}}",
               "refId": "A"
@@ -9691,7 +9691,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"edusharing-repository-search-solr4.*\", container!=\"\", image!=\"\"}) by (pod)",
+              "expr": "sum(container_memory_working_set_bytes{cluster=\"$cluster\", namespace=\"$namespace\", pod=~\"edusharing-repository-search-solr.*\", container!=\"\", image!=\"\"}) by (pod)",
               "interval": "",
               "legendFormat": "{{pod}}",
               "refId": "A"
@@ -9786,7 +9786,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "process_open_fds{namespace=\"$namespace\",service=\"edusharing-repository-search-solr4-metrics\"}",
+              "expr": "process_open_fds{namespace=\"$namespace\",service=\"edusharing-repository-search-solr-metrics\"}",
               "interval": "",
               "legendFormat": "{{pod}}",
               "refId": "A"
@@ -9835,7 +9835,7 @@
           }
         }
       ],
-      "title": "edusharing-repository-search-solr4",
+      "title": "edusharing-repository-search-solr",
       "type": "row"
     },
     {
@@ -9897,7 +9897,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "jvm_memory_bytes_used{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",area=\"heap\"}",
+              "expr": "jvm_memory_bytes_used{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",area=\"heap\"}",
               "interval": "",
               "legendFormat": "{{pod}}",
               "refId": "A"
@@ -9992,7 +9992,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "jvm_memory_bytes_committed{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",area=\"heap\"}",
+              "expr": "jvm_memory_bytes_committed{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",area=\"heap\"}",
               "interval": "",
               "legendFormat": "{{pod}}",
               "refId": "A"
@@ -10087,7 +10087,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "jvm_memory_bytes_max{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",area=\"heap\"}",
+              "expr": "jvm_memory_bytes_max{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",area=\"heap\"}",
               "interval": "",
               "legendFormat": "{{pod}}",
               "refId": "A"
@@ -10182,7 +10182,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "jvm_memory_bytes_used{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",area=\"nonheap\"}",
+              "expr": "jvm_memory_bytes_used{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",area=\"nonheap\"}",
               "interval": "",
               "legendFormat": "{{pod}}",
               "refId": "A"
@@ -10277,7 +10277,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "jvm_memory_bytes_committed{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",area=\"nonheap\"}",
+              "expr": "jvm_memory_bytes_committed{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",area=\"nonheap\"}",
               "interval": "",
               "legendFormat": "{{pod}}",
               "refId": "A"
@@ -10372,7 +10372,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(jvm_gc_collection_seconds_count{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\"}[$__rate_interval])) by (pod)",
+              "expr": "sum(rate(jvm_gc_collection_seconds_count{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\"}[$__rate_interval])) by (pod)",
               "interval": "",
               "legendFormat": "{{pod}}",
               "refId": "A"
@@ -10467,7 +10467,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(jvm_gc_collection_seconds_sum{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\"}[$__rate_interval])) by (pod)",
+              "expr": "sum(rate(jvm_gc_collection_seconds_sum{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\"}[$__rate_interval])) by (pod)",
               "interval": "",
               "legendFormat": "{{pod}}",
               "refId": "A"
@@ -10562,7 +10562,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "jvm_threads_current{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\"}",
+              "expr": "jvm_threads_current{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\"}",
               "hide": false,
               "interval": "",
               "legendFormat": "{{pod}}",
@@ -10658,7 +10658,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "jvm_threads_daemon{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\"}",
+              "expr": "jvm_threads_daemon{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\"}",
               "hide": false,
               "interval": "",
               "legendFormat": "{{pod}}",
@@ -10754,7 +10754,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "jvm_threads_peak{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\"}",
+              "expr": "jvm_threads_peak{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\"}",
               "hide": false,
               "interval": "",
               "legendFormat": "{{pod}}",
@@ -10803,7 +10803,7 @@
           }
         }
       ],
-      "title": "edusharing-repository-search-solr4 (jvm)",
+      "title": "edusharing-repository-search-solr (jvm)",
       "type": "row"
     },
     {
@@ -10865,7 +10865,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(solr_cache_size_kb{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"alfresco\"}) by (cache)",
+              "expr": "sum(solr_cache_size_kb{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"alfresco\"}) by (cache)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{cache}}",
@@ -10961,7 +10961,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(solr_cache_hit_ratio{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"alfresco\"}) by (cache)",
+              "expr": "sum(solr_cache_hit_ratio{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"alfresco\"}) by (cache)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{cache}}",
@@ -11057,7 +11057,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(solr_cache_eviction_total{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"alfresco\"}[$__rate_interval])) by (cache)",
+              "expr": "sum(rate(solr_cache_eviction_total{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"alfresco\"}[$__rate_interval])) by (cache)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{cache}}",
@@ -11153,7 +11153,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(solr_handler_request_milliseconds_count{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"alfresco\"}[$__rate_interval])) by (handler)",
+              "expr": "sum(rate(solr_handler_request_milliseconds_count{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"alfresco\"}[$__rate_interval])) by (handler)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{handler}}",
@@ -11249,7 +11249,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(solr_handler_request_milliseconds_sum{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"alfresco\"}[$__rate_interval])) by (handler)",
+              "expr": "sum(rate(solr_handler_request_milliseconds_sum{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"alfresco\"}[$__rate_interval])) by (handler)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{handler}}",
@@ -11345,7 +11345,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(solr_handler_request_error_total{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"alfresco\"}[$__rate_interval])) by (cache)",
+              "expr": "sum(rate(solr_handler_request_error_total{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"alfresco\"}[$__rate_interval])) by (cache)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{cache}}",
@@ -11441,7 +11441,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "solr_searcher_doc_current{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"alfresco\",searcher=\"searcher\"}",
+              "expr": "solr_searcher_doc_current{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"alfresco\",searcher=\"searcher\"}",
               "hide": false,
               "interval": "",
               "legendFormat": "{{pod}}",
@@ -11537,7 +11537,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(solr_searcher_doc_deleted{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"alfresco\",searcher=\"searcher\"}) by (pod)",
+              "expr": "sum(solr_searcher_doc_deleted{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"alfresco\",searcher=\"searcher\"}) by (pod)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{pod}}",
@@ -11586,7 +11586,7 @@
           }
         }
       ],
-      "title": "edusharing-repository-search-solr4 (alfresco)",
+      "title": "edusharing-repository-search-solr (alfresco)",
       "type": "row"
     },
     {
@@ -11648,7 +11648,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(solr_cache_size_kb{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"archive\"}) by (cache)",
+              "expr": "sum(solr_cache_size_kb{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"archive\"}) by (cache)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{cache}}",
@@ -11744,7 +11744,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(solr_cache_hit_ratio{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"archive\"}) by (cache)",
+              "expr": "sum(solr_cache_hit_ratio{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"archive\"}) by (cache)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{cache}}",
@@ -11840,7 +11840,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(solr_cache_eviction_total{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"archive\"}[$__rate_interval])) by (cache)",
+              "expr": "sum(rate(solr_cache_eviction_total{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"archive\"}[$__rate_interval])) by (cache)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{cache}}",
@@ -11936,7 +11936,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(solr_handler_request_milliseconds_count{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"archive\"}[$__rate_interval])) by (handler)",
+              "expr": "sum(rate(solr_handler_request_milliseconds_count{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"archive\"}[$__rate_interval])) by (handler)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{handler}}",
@@ -12032,7 +12032,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(solr_handler_request_milliseconds_sum{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"archive\"}[$__rate_interval])) by (handler)",
+              "expr": "sum(rate(solr_handler_request_milliseconds_sum{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"archive\"}[$__rate_interval])) by (handler)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{handler}}",
@@ -12128,7 +12128,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(rate(solr_handler_request_error_total{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"archive\"}[$__rate_interval])) by (cache)",
+              "expr": "sum(rate(solr_handler_request_error_total{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"archive\"}[$__rate_interval])) by (cache)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{cache}}",
@@ -12224,7 +12224,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "solr_searcher_doc_current{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"archive\",searcher=\"searcher\"}",
+              "expr": "solr_searcher_doc_current{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"archive\",searcher=\"searcher\"}",
               "hide": false,
               "interval": "",
               "legendFormat": "{{pod}}",
@@ -12320,7 +12320,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(solr_searcher_doc_deleted{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr4.*\",core=\"archive\",searcher=\"searcher\"}) by (pod)",
+              "expr": "sum(solr_searcher_doc_deleted{cluster=\"$cluster\", namespace=\"$namespace\",pod=~\"edusharing-repository-search-solr.*\",core=\"archive\",searcher=\"searcher\"}) by (pod)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{pod}}",
@@ -12369,7 +12369,7 @@
           }
         }
       ],
-      "title": "edusharing-repository-search-solr4 (archive)",
+      "title": "edusharing-repository-search-solr (archive)",
       "type": "row"
     },
     {