diff --git a/README.md b/README.md
index 8043acab5fe6bdb1e1cdb526b19169964909ac25..0c432af1688651b6c67924fe616e23c8de674389 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,6 @@
 - [FAQ Documentation](#faq-documentation)
 
 
-
 # 3GPP Common API Framework OpenCAPIF implementation
 This repository includes all services developed using Python Flask servers, created with openapi-generator with swagger definitions on [Open API Descriptions of 3GPP 5G APIs] for release 18 of Technical Specifications.
 
diff --git a/helm/00_capif_monitoring/README.md b/helm/00_capif_monitoring/README.md
index 04814b511f3ee76bf9bbef77652e270cf0cd2b6d..4b0d293db55b1a5fc4d469d70a3775fe675b7f36 100644
--- a/helm/00_capif_monitoring/README.md
+++ b/helm/00_capif_monitoring/README.md
@@ -11,26 +11,8 @@ A Helm chart to CAPIF in Kubernetes
 |  | fluentbit | * |
 |  | grafana | * |
 |  | loki | * |
-|  | mock-server | * |
-|  | mongo | * |
-|  | mongo-express | * |
-|  | mongo-register | * |
-|  | mongo-register-express | * |
 |  | nginx | * |
-|  | ocf-access-control-policy | * |
-|  | ocf-api-invocation-logs | * |
-|  | ocf-api-invoker-management | * |
-|  | ocf-api-provider-management | * |
-|  | ocf-auditing-api-logs | * |
-|  | ocf-discover-service-api | * |
-|  | ocf-events | * |
-|  | ocf-helper | * |
-|  | ocf-publish-service-api | * |
-|  | ocf-register | * |
-|  | ocf-routing-info | * |
-|  | ocf-security | * |
 |  | otelcollector | * |
-|  | redis | * |
 |  | renderer | * |
 | https://grafana.github.io/helm-charts | tempo | ^1.3.1 |
 
@@ -41,9 +23,6 @@ A Helm chart to CAPIF in Kubernetes
 | fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed |
 | grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed |
 | loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed |
-| mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed |
-| mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed |
-| mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed |
 | otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed |
 | renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed |
 | tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed |
diff --git a/helm/01_capif_db/README.md b/helm/01_capif_db/README.md
index 04814b511f3ee76bf9bbef77652e270cf0cd2b6d..224578df6734b14961d66edfb33370343a7fe184 100644
--- a/helm/01_capif_db/README.md
+++ b/helm/01_capif_db/README.md
@@ -8,45 +8,13 @@ A Helm chart to CAPIF in Kubernetes
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | fluentbit | * |
-|  | grafana | * |
-|  | loki | * |
-|  | mock-server | * |
 |  | mongo | * |
-|  | mongo-express | * |
 |  | mongo-register | * |
-|  | mongo-register-express | * |
-|  | nginx | * |
-|  | ocf-access-control-policy | * |
-|  | ocf-api-invocation-logs | * |
-|  | ocf-api-invoker-management | * |
-|  | ocf-api-provider-management | * |
-|  | ocf-auditing-api-logs | * |
-|  | ocf-discover-service-api | * |
-|  | ocf-events | * |
-|  | ocf-helper | * |
-|  | ocf-publish-service-api | * |
-|  | ocf-register | * |
-|  | ocf-routing-info | * |
-|  | ocf-security | * |
-|  | otelcollector | * |
-|  | redis | * |
-|  | renderer | * |
-| https://grafana.github.io/helm-charts | tempo | ^1.3.1 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed |
-| grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed |
-| loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed |
-| mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed |
-| mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed |
-| mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed |
-| otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed |
-| renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed |
-| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
diff --git a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml
index 442eee66b2153cd25bbb0c48416cdda8c15f784c..d2432c13cff5d88ff1673143d0b18633d13b52fa 100644
--- a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml
+++ b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml
@@ -41,10 +41,10 @@ spec:
               containerPort: {{ .Values.service.port }}
               protocol: TCP
           env:
-          - name: MONGO_INITDB_ROOT_PASSWORD
-            value: {{ quote .Values.env.mongoInitdbRootPassword }}
-          - name: MONGO_INITDB_ROOT_USERNAME
-            value: {{ quote .Values.env.mongoInitdbRootUsername }}
+            - name: MONGO_INITDB_ROOT_PASSWORD
+              value: {{ quote .Values.env.mongoInitdbRootPassword }}
+            - name: MONGO_INITDB_ROOT_USERNAME
+              value: {{ quote .Values.env.mongoInitdbRootUsername }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
diff --git a/helm/01_capif_db/charts/mongo-register/values.yaml b/helm/01_capif_db/charts/mongo-register/values.yaml
index d52301d421fa286f98a7265b1cfdb72defe4052f..02a9181f4bcfcd479d35520ee09dcca1ee285aa1 100644
--- a/helm/01_capif_db/charts/mongo-register/values.yaml
+++ b/helm/01_capif_db/charts/mongo-register/values.yaml
@@ -79,6 +79,7 @@ livenessProbe:
 #  httpGet:
 #    path: /
 #    port: http
+
 readinessProbe:
   tcpSocket:
     port: 27017
diff --git a/helm/01_capif_db/charts/mongo/templates/deployment.yaml b/helm/01_capif_db/charts/mongo/templates/deployment.yaml
index 244693ccdf2e7a8bf896476f46f70d8189a155c8..bf43c770fa0ea7ef4d7e599456c40ceebc7beee9 100644
--- a/helm/01_capif_db/charts/mongo/templates/deployment.yaml
+++ b/helm/01_capif_db/charts/mongo/templates/deployment.yaml
@@ -41,10 +41,10 @@ spec:
               containerPort: {{ .Values.service.port }}
               protocol: TCP
           env:
-          - name: MONGO_INITDB_ROOT_PASSWORD
-            value: {{ quote .Values.env.mongoInitdbRootPassword }}
-          - name: MONGO_INITDB_ROOT_USERNAME
-            value: {{ quote .Values.env.mongoInitdbRootUsername }}
+            - name: MONGO_INITDB_ROOT_PASSWORD
+              value: {{ quote .Values.env.mongoInitdbRootPassword }}
+            - name: MONGO_INITDB_ROOT_USERNAME
+              value: {{ quote .Values.env.mongoInitdbRootUsername }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
diff --git a/helm/01_capif_db/charts/mongo/values.yaml b/helm/01_capif_db/charts/mongo/values.yaml
index 0ba34e90634edc813b503e67e4570d900e0fac64..c170b1e44bcb0a52e8907624585a15f571b91a26 100644
--- a/helm/01_capif_db/charts/mongo/values.yaml
+++ b/helm/01_capif_db/charts/mongo/values.yaml
@@ -90,7 +90,6 @@ livenessProbe:
 readinessProbe:
   tcpSocket:
     port: 27017
-#  initialDelaySeconds: 5
   periodSeconds: 5
 
 autoscaling:
diff --git a/helm/02_capif_db_express/README.md b/helm/02_capif_db_express/README.md
index 04814b511f3ee76bf9bbef77652e270cf0cd2b6d..d87ced22b27b60e6d550a182e107968c49dbb3f9 100644
--- a/helm/02_capif_db_express/README.md
+++ b/helm/02_capif_db_express/README.md
@@ -8,45 +8,15 @@ A Helm chart to CAPIF in Kubernetes
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | fluentbit | * |
-|  | grafana | * |
-|  | loki | * |
-|  | mock-server | * |
-|  | mongo | * |
 |  | mongo-express | * |
-|  | mongo-register | * |
 |  | mongo-register-express | * |
-|  | nginx | * |
-|  | ocf-access-control-policy | * |
-|  | ocf-api-invocation-logs | * |
-|  | ocf-api-invoker-management | * |
-|  | ocf-api-provider-management | * |
-|  | ocf-auditing-api-logs | * |
-|  | ocf-discover-service-api | * |
-|  | ocf-events | * |
-|  | ocf-helper | * |
-|  | ocf-publish-service-api | * |
-|  | ocf-register | * |
-|  | ocf-routing-info | * |
-|  | ocf-security | * |
-|  | otelcollector | * |
-|  | redis | * |
-|  | renderer | * |
-| https://grafana.github.io/helm-charts | tempo | ^1.3.1 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed |
-| grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed |
-| loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed |
-| mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed |
 | mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed |
 | mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed |
-| otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed |
-| renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed |
-| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
diff --git a/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml b/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml
index 32bda4483e58ab4e41c973ac77e02a79b1b2cb5a..13bba03be690a8ae741351948c0ca9a1deecab57 100644
--- a/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml
+++ b/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml
@@ -40,12 +40,22 @@ spec:
               containerPort: {{ .Values.service.targetPort }}
               protocol: TCP
           env:
+          - name: ME_CONFIG_MONGODB_ENABLE_ADMIN
+            value: {{ quote .Values.env.meConfigMongodbEnableAdmin }}
+          - name: ME_CONFIG_BASICAUTH_USERNAME
+            value: {{ quote .Values.env.meConfigBasicauthUsername }}
+          - name: ME_CONFIG_BASICAUTH_PASSWORD
+            value: {{ quote .Values.env.meConfigBasicauthPassword }}
           - name: ME_CONFIG_MONGODB_ADMINUSERNAME
             value: {{ quote .Values.env.meConfigMongodbAdminusername }}
           - name: ME_CONFIG_MONGODB_ADMINPASSWORD
             value: {{ quote .Values.env.meConfigMongodbAdminpassword }}
           - name: ME_CONFIG_MONGODB_URL
             value: {{ quote .Values.env.meConfigMongodbUrl }}
+          - name: ME_CONFIG_CONNECT_RETRIES
+            value: "10"
+          - name: ME_CONFIG_CONNECT_RETRY_INTERVAL
+            value: "5000"
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
diff --git a/helm/02_capif_db_express/charts/mongo-express/values.yaml b/helm/02_capif_db_express/charts/mongo-express/values.yaml
index 76ce47e99026f1986269aa1cf02004770c015612..a6a6f45652a15ab828a4548b109fcd76cad0c11b 100644
--- a/helm/02_capif_db_express/charts/mongo-express/values.yaml
+++ b/helm/02_capif_db_express/charts/mongo-express/values.yaml
@@ -17,9 +17,13 @@ nameOverride: ""
 fullnameOverride: ""
 
 env:
+  meConfigMongodbEnableAdmin: true
+  meConfigBasicauthUsername: admin
+  meConfigBasicauthPassword: admin
   meConfigMongodbAdminusername: root
   meConfigMongodbAdminpassword: example
   meConfigMongodbUrl: mongodb://root:example@mongo:27017/
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
diff --git a/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml b/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml
index d77c8bcb5fed6e6fede4b423642aa277115bd43d..2e93bca2e59b311c1f21dada0444356aefdd22b2 100644
--- a/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml
+++ b/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml
@@ -40,12 +40,22 @@ spec:
               containerPort: {{ .Values.service.targetPort }}
               protocol: TCP
           env:
+          - name: ME_CONFIG_MONGODB_ENABLE_ADMIN
+            value: {{ quote .Values.env.meConfigMongodbEnableAdmin }}
+          - name: ME_CONFIG_BASICAUTH_USERNAME
+            value: {{ quote .Values.env.meConfigBasicauthUsername }}
+          - name: ME_CONFIG_BASICAUTH_PASSWORD
+            value: {{ quote .Values.env.meConfigBasicauthPassword }}
           - name: ME_CONFIG_MONGODB_ADMINPASSWORD
             value: {{ quote .Values.env.meConfigMongodbAdminpassword }}
           - name: ME_CONFIG_MONGODB_ADMINUSERNAME
             value: {{ quote .Values.env.meConfigMongodbAdminusername }}
           - name: ME_CONFIG_MONGODB_URL
             value: {{ quote .Values.env.meConfigMongodbUrl }}
+          - name: ME_CONFIG_CONNECT_RETRIES
+            value: "10"
+          - name: ME_CONFIG_CONNECT_RETRY_INTERVAL
+            value: "5000"
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
diff --git a/helm/02_capif_db_express/charts/mongo-register-express/values.yaml b/helm/02_capif_db_express/charts/mongo-register-express/values.yaml
index f174fbd5bb1e0cfd16489b55375ea075116cc959..3178063b25dcbe59587eb65d4f18c0de6c125fba 100644
--- a/helm/02_capif_db_express/charts/mongo-register-express/values.yaml
+++ b/helm/02_capif_db_express/charts/mongo-register-express/values.yaml
@@ -17,9 +17,12 @@ nameOverride: ""
 fullnameOverride: ""
 
 env:
- meConfigMongodbAdminusername: root
- meConfigMongodbAdminpassword: example
- meConfigMongodbUrl: mongodb://root:example@mongo-register:27017/
+  meConfigMongodbEnableAdmin: true
+  meConfigBasicauthUsername: admin
+  meConfigBasicauthPassword: admin
+  meConfigMongodbAdminusername: root
+  meConfigMongodbAdminpassword: example
+  meConfigMongodbUrl: mongodb://root:example@mongo-register:27017/
 
 serviceAccount:
   # Specifies whether a service account should be created
diff --git a/helm/03_capif_commons/README.md b/helm/03_capif_commons/README.md
index 04814b511f3ee76bf9bbef77652e270cf0cd2b6d..85514ddf680ea97e505d59a8645f125ed783dd9b 100644
--- a/helm/03_capif_commons/README.md
+++ b/helm/03_capif_commons/README.md
@@ -8,45 +8,16 @@ A Helm chart to CAPIF in Kubernetes
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | fluentbit | * |
-|  | grafana | * |
-|  | loki | * |
+|  | celery-beat | * |
+|  | celery-worker | * |
 |  | mock-server | * |
-|  | mongo | * |
-|  | mongo-express | * |
-|  | mongo-register | * |
-|  | mongo-register-express | * |
-|  | nginx | * |
-|  | ocf-access-control-policy | * |
-|  | ocf-api-invocation-logs | * |
-|  | ocf-api-invoker-management | * |
-|  | ocf-api-provider-management | * |
-|  | ocf-auditing-api-logs | * |
-|  | ocf-discover-service-api | * |
-|  | ocf-events | * |
-|  | ocf-helper | * |
-|  | ocf-publish-service-api | * |
-|  | ocf-register | * |
-|  | ocf-routing-info | * |
-|  | ocf-security | * |
-|  | otelcollector | * |
 |  | redis | * |
-|  | renderer | * |
-| https://grafana.github.io/helm-charts | tempo | ^1.3.1 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed |
-| grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed |
-| loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed |
 | mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed |
-| mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed |
-| mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed |
-| otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed |
-| renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed |
-| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
diff --git a/helm/04_capif_services/README.md b/helm/04_capif_services/README.md
index 04814b511f3ee76bf9bbef77652e270cf0cd2b6d..b6172cb5789509e8bd0bab9a91098c024a7fd7c9 100644
--- a/helm/04_capif_services/README.md
+++ b/helm/04_capif_services/README.md
@@ -8,14 +8,6 @@ A Helm chart to CAPIF in Kubernetes
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | fluentbit | * |
-|  | grafana | * |
-|  | loki | * |
-|  | mock-server | * |
-|  | mongo | * |
-|  | mongo-express | * |
-|  | mongo-register | * |
-|  | mongo-register-express | * |
 |  | nginx | * |
 |  | ocf-access-control-policy | * |
 |  | ocf-api-invocation-logs | * |
@@ -23,30 +15,17 @@ A Helm chart to CAPIF in Kubernetes
 |  | ocf-api-provider-management | * |
 |  | ocf-auditing-api-logs | * |
 |  | ocf-discover-service-api | * |
+|  | ocf-open-discover-service-api | * |
 |  | ocf-events | * |
 |  | ocf-helper | * |
 |  | ocf-publish-service-api | * |
-|  | ocf-register | * |
 |  | ocf-routing-info | * |
 |  | ocf-security | * |
-|  | otelcollector | * |
-|  | redis | * |
-|  | renderer | * |
-| https://grafana.github.io/helm-charts | tempo | ^1.3.1 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed |
-| grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed |
-| loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed |
-| mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed |
-| mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed |
-| mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed |
-| otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed |
-| renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed |
-| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/.helmignore b/helm/04_capif_services/charts/ocf-open-discover-service-api/.helmignore
new file mode 100644
index 0000000000000000000000000000000000000000..0e8a0eb36f4ca2c939201c0d54b5d82a1ea34778
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/Chart.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/Chart.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3d42681383a0cf8e4285751f4bb49f8cd4a0e5be
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: ocf-open-discover-service-api
+description: A Helm chart for Kubernetes of ocf-open-discover-service-api
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/README.md b/helm/04_capif_services/charts/ocf-open-discover-service-api/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..edef68971dae9e8da2d1e7ede1d6a4cd0ec7de26
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/README.md
@@ -0,0 +1,63 @@
+# ocf-open-discover-service-api
+
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+
+A Helm chart for Kubernetes of ocf-open-discover-service-api
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` |  |
+| autoscaling.enabled | bool | `false` |  |
+| autoscaling.maxReplicas | int | `100` |  |
+| autoscaling.minReplicas | int | `1` |  |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
+| env.logLevel | string | `"INFO"` |  |
+| env.mongoInitdbRootPassword | string | `"example"` |  |
+| env.mongoInitdbRootUsername | string | `"root"` |  |
+| env.monitoring | string | `"true"` |  |
+| fullnameOverride | string | `""` |  |
+| image.pullPolicy | string | `"Always"` |  |
+| image.repository | string | `"ocf-open-discover-service-api"` |  |
+| image.tag | string | `""` |  |
+| imagePullSecrets | list | `[]` |  |
+| ingress.annotations | object | `{}` |  |
+| ingress.className | string | `""` |  |
+| ingress.enabled | bool | `false` |  |
+| ingress.hosts[0].host | string | `"chart-example.local"` |  |
+| ingress.hosts[0].paths[0].path | string | `"/"` |  |
+| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
+| ingress.tls | list | `[]` |  |
+| livenessProbe | string | `nil` |  |
+| nameOverride | string | `""` |  |
+| nodeSelector | object | `{}` |  |
+| podAnnotations | object | `{}` |  |
+| podLabels | object | `{}` |  |
+| podSecurityContext | object | `{}` |  |
+| readinessProbe.initialDelaySeconds | int | `5` |  |
+| readinessProbe.periodSeconds | int | `5` |  |
+| readinessProbe.tcpSocket.port | int | `8080` |  |
+| replicaCount | int | `1` |  |
+| resources.limits.cpu | string | `"100m"` |  |
+| resources.limits.memory | string | `"128Mi"` |  |
+| resources.requests.cpu | string | `"100m"` |  |
+| resources.requests.memory | string | `"128Mi"` |  |
+| securityContext | object | `{}` |  |
+| service.port | int | `8080` |  |
+| service.type | string | `"ClusterIP"` |  |
+| serviceAccount.annotations | object | `{}` |  |
+| serviceAccount.automount | bool | `true` |  |
+| serviceAccount.create | bool | `true` |  |
+| serviceAccount.name | string | `""` |  |
+| tolerations | list | `[]` |  |
+| volumeMounts[0].mountPath | string | `"/usr/src/app/config.yaml"` |  |
+| volumeMounts[0].name | string | `"capif-opendiscover-service-config"` |  |
+| volumeMounts[0].subPath | string | `"config.yaml"` |  |
+| volumes[0].configMap.items[0].key | string | `"config.yaml"` |  |
+| volumes[0].configMap.items[0].path | string | `"config.yaml"` |  |
+| volumes[0].configMap.name | string | `"capif-opendiscover-service-configmap"` |  |
+| volumes[0].name | string | `"capif-opendiscover-service-config"` |  |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/NOTES.txt b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/NOTES.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c14d5725bd05b83e5099c5b85ae989834bd54ed2
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/NOTES.txt
@@ -0,0 +1,22 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "ocf-open-discover-service-api.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "ocf-open-discover-service-api.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "ocf-open-discover-service-api.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "ocf-open-discover-service-api.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/_helpers.tpl b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/_helpers.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..08b567f235783a3f7de33420ce87ae764c983cef
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "ocf-open-discover-service-api.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "ocf-open-discover-service-api.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "ocf-open-discover-service-api.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "ocf-open-discover-service-api.labels" -}}
+helm.sh/chart: {{ include "ocf-open-discover-service-api.chart" . }}
+{{ include "ocf-open-discover-service-api.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "ocf-open-discover-service-api.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "ocf-open-discover-service-api.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "ocf-open-discover-service-api.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "ocf-open-discover-service-api.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/configmap.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a68e0532bdae084959db76aee58429bf20082f6e
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/configmap.yaml
@@ -0,0 +1,28 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: capif-opendiscover-service-configmap
+data:
+  config.yaml: |
+    mongo: {
+      'user': '{{ .Values.env.mongoInitdbRootUsername }}',
+      'password': '{{ .Values.env.mongoInitdbRootPassword }}',
+      'db': 'capif',
+      'col': 'serviceapidescriptions',
+      'invokers_col': 'invokerdetails',
+      'capif_users_col': 'user',
+      'certs_col': 'certs',
+      'host': 'mongo',
+      'port': "27017"
+    }
+
+    monitoring: {
+      "fluent_bit_host": fluent-bit,
+      "fluent_bit_port": 24224,
+      "opentelemetry_url": "otel-collector",
+      "opentelemetry_port": "55680",
+      "opentelemetry_max_queue_size": 8192,
+      "opentelemetry_schedule_delay_millis": 20000,
+      "opentelemetry_max_export_batch_size": 2048,
+      "opentelemetry_export_timeout_millis": 60000
+    }
\ No newline at end of file
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/deployment.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..22b810d0fdabb86ac913ef015c869927ec617a3d
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/deployment.yaml
@@ -0,0 +1,80 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "ocf-open-discover-service-api.fullname" . }}
+  labels:
+    {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "ocf-open-discover-service-api.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        date: "{{  now | unixEpoch }}"
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+      labels:
+        {{- include "ocf-open-discover-service-api.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "ocf-open-discover-service-api.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP
+          env:
+            - name: CAPIF_HOSTNAME
+              value: {{ quote .Values.env.capifHostname }}
+            - name: MONITORING
+              value: {{ quote .Values.env.monitoring }}
+            - name: VAULT_HOSTNAME
+              value: {{ quote .Values.env.vaultHostname }}
+            - name: VAULT_PORT
+              value: {{ quote .Values.env.vaultPort }}
+            - name: VAULT_ACCESS_TOKEN
+              value: {{ quote .Values.env.vaultAccessToken }}
+            - name: LOG_LEVEL
+              value: {{ quote .Values.env.logLevel }}
+          livenessProbe:
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
+          readinessProbe:
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- with .Values.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/hpa.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/hpa.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ea87ab29bbc81ef4d640ec03a2e3b469a85e064c
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/hpa.yaml
@@ -0,0 +1,32 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "ocf-open-discover-service-api.fullname" . }}
+  labels:
+    {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "ocf-open-discover-service-api.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/ingress.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/ingress.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1715fcfb95554d1fbffd00220afe0a458ac6764b
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/ingress.yaml
@@ -0,0 +1,61 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "ocf-open-discover-service-api.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
+          {{- end }}
+    {{- end }}
+{{- end }}
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c36f55b331f58ee217008e13728213b10c2b8511
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: open-api-disc
+  labels:
+    {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "ocf-open-discover-service-api.selectorLabels" . | nindent 4 }}
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/serviceaccount.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/serviceaccount.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7afa97c30443e84f0d35d7ccd781787da2d388fd
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "ocf-open-discover-service-api.serviceAccountName" . }}
+  labels:
+    {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
+{{- end }}
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/tests/test-connection.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/tests/test-connection.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c76a8c3fb7ba5b02c37026a13aa1ff263e420bee
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "ocf-open-discover-service-api.fullname" . }}-test-connection"
+  labels:
+    {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['open-discover-service-apis:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/values.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/values.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e479015b384d446e159df55e3cc5aacb33346154
--- /dev/null
+++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/values.yaml
@@ -0,0 +1,122 @@
+# Default values for ocf-open-discover-service-api.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: ocf-open-discover-service-api
+  pullPolicy: Always
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+env:
+  monitoring: "true"
+  capifHostname: capif
+  vaultHostname: vault
+  vaultPort: 8200
+  vaultAccessToken: dev-only-token
+  mongoInitdbRootUsername: root
+  mongoInitdbRootPassword: example
+  logLevel: "INFO"
+
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Automatically mount a ServiceAccount's API credentials?
+  automount: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+podLabels: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 8080
+
+ingress:
+  enabled: false
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources:
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  limits:
+    cpu: 200m
+    memory: 256Mi
+  requests:
+    cpu: 1m
+    memory: 1Mi
+
+livenessProbe:
+#  httpGet:
+#    path: /
+#    port: http
+readinessProbe:
+  tcpSocket:
+    port: 8080
+  initialDelaySeconds: 5
+  periodSeconds: 5
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+# Additional volumes on the output Deployment definition.
+volumes:
+ - name: capif-opendiscover-service-config
+   configMap:
+     name: capif-opendiscover-service-configmap
+     items:
+     - key: "config.yaml"
+       path: "config.yaml"
+
+
+# Additional volumeMounts on the output Deployment definition.
+volumeMounts:
+ - name: capif-opendiscover-service-config
+   mountPath: /usr/src/app/config.yaml
+   subPath: config.yaml
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/helm/05_capif_register/README.md b/helm/05_capif_register/README.md
index 04814b511f3ee76bf9bbef77652e270cf0cd2b6d..af3a1929fc1e9946ebcbddea0289d73ada94e470 100644
--- a/helm/05_capif_register/README.md
+++ b/helm/05_capif_register/README.md
@@ -8,45 +8,13 @@ A Helm chart to CAPIF in Kubernetes
 
 | Repository | Name | Version |
 |------------|------|---------|
-|  | fluentbit | * |
-|  | grafana | * |
-|  | loki | * |
-|  | mock-server | * |
-|  | mongo | * |
-|  | mongo-express | * |
-|  | mongo-register | * |
-|  | mongo-register-express | * |
-|  | nginx | * |
-|  | ocf-access-control-policy | * |
-|  | ocf-api-invocation-logs | * |
-|  | ocf-api-invoker-management | * |
-|  | ocf-api-provider-management | * |
-|  | ocf-auditing-api-logs | * |
-|  | ocf-discover-service-api | * |
-|  | ocf-events | * |
-|  | ocf-helper | * |
-|  | ocf-publish-service-api | * |
 |  | ocf-register | * |
-|  | ocf-routing-info | * |
-|  | ocf-security | * |
-|  | otelcollector | * |
-|  | redis | * |
-|  | renderer | * |
-| https://grafana.github.io/helm-charts | tempo | ^1.3.1 |
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed |
-| grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed |
-| loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed |
-| mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed |
-| mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed |
-| mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed |
-| otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed |
-| renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed |
-| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed |
+
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
diff --git a/helm/scripts/01_install_capif_db.sh b/helm/scripts/01_install_capif_db.sh
index addeee56615ddcd487cb9e7b2f1fdd8ac9e1bb9c..4b1aa66c4f9475038d2c8f130abc62995f20a3ed 100755
--- a/helm/scripts/01_install_capif_db.sh
+++ b/helm/scripts/01_install_capif_db.sh
@@ -39,6 +39,8 @@ install_capif_helm() {
     --set mongo-register.persistence.storageClass=$CAPIF_STORAGE_CLASS \
     --set mongo-register.persistence.storage=$CAPIF_MONGO_REGISTER_STORAGE_SIZE \
     --set mongo-register.extraFlags[0]="--repair" \
+    --set mongo-register.env.mongoInitdbRootPassword="$MONGO_DB_REGISTER_ADMIN_PASSWORD" \
+    --set mongo-register.env.mongoInitdbRootUsername="$MONGO_DB_REGISTER_ADMIN_USER" \
     --set mongo.persistence.storageClass=$CAPIF_STORAGE_CLASS \
     --set mongo.persistence.storage=$CAPIF_MONGO_STORAGE_SIZE \
     --set mongo.extraFlags[0]="--repair" \
@@ -46,6 +48,8 @@ install_capif_helm() {
     --set mongo.image.tag=6.0.2 \
     --set mongo.busybox.repository=$BASE_DOCKER_REGISTRY/busybox \
     --set mongo.busybox.tag=1.37.0 \
+    --set mongo.env.mongoInitdbRootPassword="$MONGO_DB_ADMIN_PASSWORD" \
+    --set mongo.env.mongoInitdbRootUsername="$MONGO_DB_ADMIN_USER" \
     --wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES_RESERVE $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG "${extra_args[@]}"
 }
 
diff --git a/helm/scripts/02_install_capif_db_express.sh b/helm/scripts/02_install_capif_db_express.sh
index a11a4ada405c70d1ccd0837152be8ae155ee441f..6063beb4b40da793884a9558c787f1ce158704fa 100755
--- a/helm/scripts/02_install_capif_db_express.sh
+++ b/helm/scripts/02_install_capif_db_express.sh
@@ -39,11 +39,17 @@ install_capif_helm() {
     --set mongo-register-express.ingress.hosts[0].host="mongo-express-register-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \
     --set mongo-register-express.ingress.hosts[0].paths[0].path="/" \
     --set mongo-register-express.ingress.hosts[0].paths[0].pathType="Prefix" \
+    --set mongo-register-express.env.meConfigMongodbAdminusername="$MONGO_DB_REGISTER_ADMIN_USER" \
+    --set mongo-register-express.env.meConfigMongodbAdminpassword="$MONGO_DB_REGISTER_ADMIN_PASSWORD" \
+    --set mongo-register-express.env.meConfigMongodbUrl="$MONGO_DB_REGISTER_INTERNAL_URL" \
     --set mongo-express.enabled=true \
     --set mongo-express.ingress.enabled=true \
     --set mongo-express.ingress.hosts[0].host="mongo-express-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \
     --set mongo-express.ingress.hosts[0].paths[0].path="/" \
     --set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \
+    --set mongo-express.env.meConfigMongodbAdminusername="$MONGO_DB_ADMIN_USER" \
+    --set mongo-express.env.meConfigMongodbAdminpassword="$MONGO_DB_ADMIN_PASSWORD" \
+    --set mongo-express.env.meConfigMongodbUrl="$MONGO_DB_INTERNAL_URL" \
     --wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES_RESERVE $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG "${extra_args[@]}"
 }
 
diff --git a/helm/scripts/04_install_capif_services.sh b/helm/scripts/04_install_capif_services.sh
index b9bf4c289c6ebdda9d71200e543caa9eac85b323..2f53e5e556b054e7aa9577c99dae78d6bc95dc20 100755
--- a/helm/scripts/04_install_capif_services.sh
+++ b/helm/scripts/04_install_capif_services.sh
@@ -18,7 +18,7 @@ HELM_STEP_DIR="$HELM_DIR/04_capif_services"
 cat "$HELM_STEP_DIR/Chart.yaml"
 yq e -i ".appVersion = \"$CAPIF_IMAGE_TAG\"" "$HELM_STEP_DIR/Chart.yaml"
 cat "$HELM_STEP_DIR/Chart.yaml"
-charts_04=("nginx" "ocf-access-control-policy" "ocf-api-invocation-logs" "ocf-api-invoker-management" "ocf-api-provider-management" "ocf-auditing-api-logs" "ocf-discover-service-api" "ocf-events" "ocf-helper" "ocf-publish-service-api" "ocf-routing-info" "ocf-security")
+charts_04=("nginx" "ocf-access-control-policy" "ocf-api-invocation-logs" "ocf-api-invoker-management" "ocf-api-provider-management" "ocf-auditing-api-logs" "ocf-discover-service-api" "ocf-events" "ocf-helper" "ocf-publish-service-api" "ocf-routing-info" "ocf-security" "ocf-open-discover-service-api")
 for chart in "${charts_04[@]}"; do
   yq e -i ".appVersion = \"$CAPIF_IMAGE_TAG\"" "$HELM_STEP_DIR/charts/$chart/Chart.yaml"
 done
@@ -93,6 +93,14 @@ install_capif_helm() {
     --set ocf-discover-service-api.image.tag=$CAPIF_IMAGE_TAG \
     --set ocf-discover-service-api.env.monitoring="true" \
     --set ocf-discover-service-api.env.logLevel="$LOG_LEVEL" \
+    --set ocf-open-discover-service-api.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-open-discover-service-api \
+    --set ocf-open-discover-service-api.image.tag=$CAPIF_IMAGE_TAG \
+    --set ocf-open-discover-service-api.env.monitoring="true" \
+    --set ocf-open-discover-service-api.env.capifHostname=$CAPIF_HOSTNAME \
+    --set ocf-open-discover-service-api.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \
+    --set ocf-open-discover-service-api.env.vaultPort=$VAULT_PORT \
+    --set ocf-open-discover-service-api.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
+    --set ocf-open-discover-service-api.env.logLevel="$LOG_LEVEL" \
     --set ocf-helper.image.repository=$CAPIF_DOCKER_REGISTRY/helper \
     --set ocf-helper.image.tag=$CAPIF_IMAGE_TAG \
     --set ocf-helper.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \
diff --git a/helm/scripts/variables.sh b/helm/scripts/variables.sh
index 746719de9bde086b87624ea4db27684b0693bf22..f87c6af5388a344ffbf586ae12ca467b7e6976b1 100755
--- a/helm/scripts/variables.sh
+++ b/helm/scripts/variables.sh
@@ -136,6 +136,12 @@ export CAPIF_OTELCOLLECTOR_ENABLED=true
 
 # special configuration for capif deployment
 
+## Mongo DBs
+export MONGO_DB_ADMIN_USER="root"
+export MONGO_DB_ADMIN_PASSWORD="example"
+export MONGO_DB_REGISTER_ADMIN_USER="root"
+export MONGO_DB_REGISTER_ADMIN_PASSWORD="example"
+
 ## Setup KUBECONFIG
 export KUBECONFIG=$CUSTOM_KUBECONFIG
 
@@ -268,4 +274,10 @@ wait_chart() {
         echo "   → Waiting rollout of $deploy ..."
         kubectl rollout status deployment/"$deploy" -n "$NAMESPACE" --timeout=300s
     done
-}
\ No newline at end of file
+}
+
+# DB URLs
+# export MONGO_DB_REGISTER_INTERNAL_URL="mongodb://$MONGO_DB_REGISTER_ADMIN_USER:$MONGO_DB_REGISTER_ADMIN_PASSWORD@mongo-register.$CAPIF_NAMESPACE.svc.cluster.local:27017/"
+# export MONGO_DB_INTERNAL_URL="mongodb://$MONGO_DB_ADMIN_USER:$MONGO_DB_ADMIN_PASSWORD@mongo.$CAPIF_NAMESPACE.svc.cluster.local:27017/"
+export MONGO_DB_REGISTER_INTERNAL_URL="mongodb://$MONGO_DB_REGISTER_ADMIN_USER:$MONGO_DB_REGISTER_ADMIN_PASSWORD@mongo-register:27017/"
+export MONGO_DB_INTERNAL_URL="mongodb://$MONGO_DB_ADMIN_USER:$MONGO_DB_ADMIN_PASSWORD@mongo:27017/"