diff --git a/ci-templates/build.yml b/ci-templates/build.yml
index bd5d8935a081899b676ff257b9813ac74f1a7fa5..4d10538a5c87e46e6291c9551aff61b437360221 100644
--- a/ci-templates/build.yml
+++ b/ci-templates/build.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn deploy -s ci_settings.xml -DskipTests -Dversion=$APP_VERSION
+    - mvn deploy -s ci_settings.xml -Dversion=$APP_VERSION
   artifacts:
     paths:
       - target/
diff --git a/ci-templates/build_unprotected.yml b/ci-templates/build_unprotected.yml
index 369d8d99bd0c2c28bffa6d8ae02ebdbe9e200bfe..a5c86697e727ef62c38b8c1801f0f23ec20c0b4e 100644
--- a/ci-templates/build_unprotected.yml
+++ b/ci-templates/build_unprotected.yml
@@ -3,7 +3,7 @@
   stage: build
   image: maven:3.9.5-ibm-semeru-17-focal
   script:
-    - mvn install -s ci_settings.xml -DskipTests
+    - mvn install -s ci_settings.xml
   artifacts:
     paths:
       - target/
diff --git a/compose/docker-compose.yaml.configure b/compose/docker-compose.yaml.configure
index 0f96e537b05239cee7583e1051435fb01617358a..b74764a607dc1f4db23e0bca7977a389b93a3ca6 100644
--- a/compose/docker-compose.yaml.configure
+++ b/compose/docker-compose.yaml.configure
@@ -52,7 +52,7 @@ services:
 
   keycloak:
       container_name: keycloak
-      image: jboss/keycloak:16.1.1
+      image: quay.io/keycloak/keycloak:16.1.1
       restart: always
       profiles: ["dev", "prod"]
       environment:
@@ -86,7 +86,7 @@ services:
     build:
         context:  ../../org.etsi.osl.portal.api/
         dockerfile: Dockerfile        
-    image: org.etsi.osl.portal.api:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "origins": "http://localhost",
@@ -133,7 +133,7 @@ services:
     build:
         context:  ../../org.etsi.osl.mano/
         dockerfile: Dockerfile        
-    image: org.etsi.osl.mano:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop
     environment:
        SPRING_APPLICATION_JSON: '{
         "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -159,7 +159,7 @@ services:
     build:
         context:  ../../org.etsi.osl.bugzilla/
         dockerfile: Dockerfile        
-    image: org.etsi.osl.bugzilla:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -185,7 +185,7 @@ services:
     build:
         context:  ../../org.etsi.osl.tmf.api/
         dockerfile: Dockerfile      
-    image: org.etsi.osl.tmf.api:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "origins": "http://localhost",
@@ -208,6 +208,11 @@ services:
         "kroki.serverurl" : "http://localhost/kroki",
         "server.forward-headers-strategy":"FRAMEWORK"  
       }'
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1g"
+        max-file: "3"  
     volumes:
     - ./repo:/root
     ports:
@@ -226,7 +231,7 @@ services:
     build:
         context:  ../../org.etsi.osl.osom/
         dockerfile: Dockerfile      
-    image: org.etsi.osl.osom:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -252,7 +257,7 @@ services:
     build:
         context:  ../../org.etsi.osl.oas/
         dockerfile: Dockerfile      
-    image: org.etsi.osl.oas:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "origins": "http://localhost",
@@ -289,7 +294,7 @@ services:
     build:
         context:  ../../org.etsi.osl.cridge/
         dockerfile: Dockerfile      
-    image: org.etsi.osl.cridge:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -328,7 +333,7 @@ services:
     build:
         context:  ../../org.etsi.osl.centrallog.service/
         dockerfile: Dockerfile        
-    image: org.etsi.osl.centrallog.service:latest
+    image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop
     environment:
       SPRING_APPLICATION_JSON: '{
         "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
diff --git a/kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml b/kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..11764038afa4e39de82cc537994a03903690cde2
--- /dev/null
+++ b/kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Config
+clusters:
+- name: development-cluster
+  cluster:
+    certificate-authority: path/to/ca.crt # Path to certificate authority file
+    server: https://123.45.67.89:6443 # Cluster API server address
+contexts:
+- name: dev-user@development-cluster
+  context:
+    cluster: development-cluster
+    namespace: development # Default namespace
+    user: dev-user
+current-context: dev-user@development-cluster
+users:
+- name: dev-user
+  user:
+    client-certificate: path/to/cert.crt # Path to the client certificate
+    client-key: path/to/key.key # Path to the client key
diff --git a/kubernetes/helm/openslice/templates/artemis.yaml b/kubernetes/helm/openslice/templates/artemis.yaml
index 74c4800b1946b065839abad8a06410616c721ffb..87c75ea00d59459c65d068fce3d7f8eb62fa71bc 100644
--- a/kubernetes/helm/openslice/templates/artemis.yaml
+++ b/kubernetes/helm/openslice/templates/artemis.yaml
@@ -26,6 +26,7 @@ spec:
     spec:
       containers:
         - image: "{{ .Values.image.artemis.repository }}:{{ .Values.image.artemis.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.artemis.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-artemis
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/blockdiag.yaml b/kubernetes/helm/openslice/templates/blockdiag.yaml
index fbd5e7ae90c52c52e21ca95771174db2b226595c..30b2025c27637392e801158d5ea496c11c8a03b2 100644
--- a/kubernetes/helm/openslice/templates/blockdiag.yaml
+++ b/kubernetes/helm/openslice/templates/blockdiag.yaml
@@ -26,6 +26,7 @@ spec:
     spec:
       containers:
         - image: "{{ .Values.image.blockdiag.repository }}:{{ .Values.image.blockdiag.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.blockdiag.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-blockdiag
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/bugzilla.yaml b/kubernetes/helm/openslice/templates/bugzilla.yaml
index 640225776ec891c031d180b7f1d68bb508d9a849..d759a2554c42af2abf6e209f2207b92cfc9ef7cb 100644
--- a/kubernetes/helm/openslice/templates/bugzilla.yaml
+++ b/kubernetes/helm/openslice/templates/bugzilla.yaml
@@ -26,6 +26,7 @@ spec:
     spec:
       containers:
         - image: "{{ .Values.image.bugzilla.repository }}:{{ .Values.image.bugzilla.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.bugzilla.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-bugzilla
           env:
             - name: SPRING_APPLICATION_JSON
diff --git a/kubernetes/helm/openslice/templates/centrallog.yaml b/kubernetes/helm/openslice/templates/centrallog.yaml
index a43e810552eff7c0d1a95f2d78947e671e512bbf..b8143fcd9f39869242c7192e96b1a55a08e94246 100644
--- a/kubernetes/helm/openslice/templates/centrallog.yaml
+++ b/kubernetes/helm/openslice/templates/centrallog.yaml
@@ -26,6 +26,7 @@ spec:
     spec:
       containers:
         - image: "{{ .Values.image.centrallog.repository }}:{{ .Values.image.centrallog.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.centrallog.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-centrallog
           env:
             - name: SPRING_APPLICATION_JSON
diff --git a/kubernetes/helm/openslice/templates/cridge-config.yaml b/kubernetes/helm/openslice/templates/cridge-config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a08ebd4510247017626150e9f5b5553d9417bbfc
--- /dev/null
+++ b/kubernetes/helm/openslice/templates/cridge-config.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ include "openslice.fullname" . }}
+    org.etsi.osl.service: cridge
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- include "openslice.labels" . | nindent 4 }}
+  name: {{ include "openslice.fullname" . }}-cridge-kubeconfig
+data:
+  config: |-
+    {{- .Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml" | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3b90404a5f87cce2bc5151ad8fb72393f8cc8405
--- /dev/null
+++ b/kubernetes/helm/openslice/templates/cridge.yaml
@@ -0,0 +1,55 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:	
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ include "openslice.fullname" . }}
+    org.etsi.osl.service: cridge
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- include "openslice.labels" . | nindent 4 }}
+  name: {{ include "openslice.fullname" . }}-cridge
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app: {{ include "openslice.fullname" . }}
+      org.etsi.osl.service: cridge
+      {{- include "openslice.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "openslice.fullname" . }}
+        org.etsi.osl.service: cridge
+        {{- include "openslice.selectorLabels" . | nindent 8 }}
+    spec:
+      initContainers:
+        - name: init-osscapi
+          image: busybox:1.28
+          command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-osscapi; do echo waiting for osscapi; sleep 2; done"]
+      containers:
+        - image: "{{ .Values.image.cridge.repository }}:{{ .Values.image.cridge.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.cridge.pullPolicy | default "Always" }}
+          name: {{ include "openslice.fullname" . }}-cridge
+          env:
+            - name: SPRING_APPLICATION_JSON
+              value: >-
+                {
+                  "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", 
+                  "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", 
+                  "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",
+                  "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}",
+                  "org.etsi.osl.cridge" : "{{ .Values.cridge.mode | default "DEBUG" }}" 
+                }
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: cridge-kubeconfig
+              readOnly: true
+              mountPath: /root/.kube
+      restartPolicy: Always
+      volumes:
+        - name: cridge-kubeconfig
+          configMap:
+            name: {{ include "openslice.fullname" . }}-cridge-kubeconfig
diff --git a/kubernetes/helm/openslice/templates/keycloak.yaml b/kubernetes/helm/openslice/templates/keycloak.yaml
index 1b697565a8116436074791fe09518368ce8a0f9b..fca2bdbe8782e30adda9e4a54e3b0aa455f5a573 100644
--- a/kubernetes/helm/openslice/templates/keycloak.yaml
+++ b/kubernetes/helm/openslice/templates/keycloak.yaml
@@ -31,6 +31,7 @@ spec:
       hostNetwork: {{ .Values.hostNetwork }}
       containers:
         - image: "{{ .Values.image.keycloak.repository }}:{{ .Values.image.keycloak.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.keycloak.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-keycloak
           env:
             - name: DB_VENDOR
diff --git a/kubernetes/helm/openslice/templates/kroki.yaml b/kubernetes/helm/openslice/templates/kroki.yaml
index c6b6f71ba2d290421912ef305928122da48cc7d4..3139d11f6a3c164693ec045c753586ec917ad651 100644
--- a/kubernetes/helm/openslice/templates/kroki.yaml
+++ b/kubernetes/helm/openslice/templates/kroki.yaml
@@ -26,6 +26,7 @@ spec:
     spec:
       containers:
         - image: "{{ .Values.image.kroki.repository }}:{{ .Values.image.kroki.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.kroki.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-kroki
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/manoclient.yaml b/kubernetes/helm/openslice/templates/manoclient.yaml
index e3f1664e205c246ae0ebcd0a92fe5566baa61686..88fd7131a43fb6ea2a7ecf30084a872063294ca2 100644
--- a/kubernetes/helm/openslice/templates/manoclient.yaml
+++ b/kubernetes/helm/openslice/templates/manoclient.yaml
@@ -26,6 +26,7 @@ spec:
     spec:
       containers:
         - image: "{{ .Values.image.manoclient.repository }}:{{ .Values.image.manoclient.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.manoclient.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-manoclient
           env:
           - name: SPRING_APPLICATION_JSON
@@ -34,7 +35,7 @@ spec:
                 "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", 
                 "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", 
                 "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", 
-                "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}"
+                "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}"
               }
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/mysql-config.yaml b/kubernetes/helm/openslice/templates/mysql-config.yaml
index ae35d5f64c0c98964da953b93aec631655f360aa..0de0e5277807c43e82193fa44c53a07e386b9470 100644
--- a/kubernetes/helm/openslice/templates/mysql-config.yaml
+++ b/kubernetes/helm/openslice/templates/mysql-config.yaml
@@ -9,5 +9,5 @@ metadata:
     {{- include "openslice.labels" . | nindent 4 }}
   name: {{ include "openslice.fullname" . }}-mysql-initdb-config
 data:
-  01-databases.sql: |-
-    {{ .Files.Get "files/mysql-init/01-databases.sql" | indent 4 }}
+  01-databases.sql: |
+    {{- tpl (.Files.Get "files/mysql-init/01-databases.sql") . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/mysql.yaml b/kubernetes/helm/openslice/templates/mysql.yaml
index 6aa246a2e5cd655ff7c51c1538ab4be1b9ad619a..b69a3f1e8cd3ecf222ed5aaa21f44feb52d2d950 100644
--- a/kubernetes/helm/openslice/templates/mysql.yaml
+++ b/kubernetes/helm/openslice/templates/mysql.yaml
@@ -27,6 +27,7 @@ spec:
     spec:
       containers:
         - image: "{{ .Values.image.mysql.repository }}:{{ .Values.image.mysql.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.mysql.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-mysql
           args:
             - "--ignore-db-dir=lost+found"
diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml
index c995d890c0cd9a94424b9f80eb3303f908d55a86..c73b3df7afde260c8e74fafd0a8825a3d455e8d7 100644
--- a/kubernetes/helm/openslice/templates/oasapi.yaml
+++ b/kubernetes/helm/openslice/templates/oasapi.yaml
@@ -34,6 +34,7 @@ spec:
       hostNetwork: {{ .Values.hostNetwork }}
       containers:
         - image: "{{ .Values.image.oasapi.repository }}:{{ .Values.image.oasapi.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.oasapi.pullPolicy | default "Always" }}
           name: {{ .Release.Name }}-oasapi
           env:          
             - name: SPRING_APPLICATION_JSON
@@ -54,7 +55,7 @@ spec:
                   "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", 
                   "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",  
                   "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", 
-                  "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}" 
+                  "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}"
                 }
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/openslice-ingress.yaml b/kubernetes/helm/openslice/templates/openslice-ingress.yaml
index 7c5523eab6c352c2d767ab7165125736a46f84d9..a2c4b575a06fd55db1ad7e31cc047e1dd5c20c39 100644
--- a/kubernetes/helm/openslice/templates/openslice-ingress.yaml
+++ b/kubernetes/helm/openslice/templates/openslice-ingress.yaml
@@ -14,12 +14,13 @@ spec:
   rules:
   - http:
       paths:
+      {{- $root := . }} # Preserve the root context
       {{- range .Values.ingress.paths }}
       - pathType: Prefix
         path: "{{ .path }}"
         backend:
           service:
-            name: {{ include "openslice.fullname" . }}-{{ .service }}
+            name: {{ include "openslice.fullname" $root }}-{{ .service }}
             port:
               number: {{ .port }}
       {{- end }}
diff --git a/kubernetes/helm/openslice/templates/osom.yaml b/kubernetes/helm/openslice/templates/osom.yaml
index 30006afc1a3b95c472a11d888d93e9d40fafdee4..12edc14626ad446a6114fec67e38954cd46e8bac 100644
--- a/kubernetes/helm/openslice/templates/osom.yaml
+++ b/kubernetes/helm/openslice/templates/osom.yaml
@@ -26,6 +26,7 @@ spec:
     spec:
       containers:
         - image: "{{ .Values.image.osom.repository }}:{{ .Values.image.osom.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.osom.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-osom
           env:
             - name: SPRING_APPLICATION_JSON
@@ -34,7 +35,7 @@ spec:
                   "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", 
                   "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}", 
                   "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}",  
-                  "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}" 
+                  "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}"
                 }
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml
index 5d78d739664069cc05321e19dac6c17d36ecab65..c84ee91f0b44ef930b1d4c510a9ce12a2b8b7556 100644
--- a/kubernetes/helm/openslice/templates/osportalapi.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi.yaml
@@ -35,6 +35,7 @@ spec:
           command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]
       containers:
         - image: "{{ .Values.image.portalapi.repository }}:{{ .Values.image.portalapi.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.portalapi.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-osportalapi
           env:
             - name: SPRING_APPLICATION_JSON
@@ -55,7 +56,7 @@ spec:
                   "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", 
                   "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",  
                   "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", 
-                  "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default 'INFO' }}"
+                  "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}"
                 }
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml
index b0f8f0f0f16700c8c30552ce733cd025d8143f37..e52a6b32f69513b09de3169b0780b39fdc7b56bf 100644
--- a/kubernetes/helm/openslice/templates/osscapi.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi.yaml
@@ -34,6 +34,7 @@ spec:
         command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]
       containers:
         - image: "{{ .Values.image.osscapi.repository }}:{{ .Values.image.osscapi.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.osscapi.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-osscapi
           env:
             - name: SPRING_APPLICATION_JSON
@@ -55,7 +56,7 @@ spec:
                   "spring.activemq.brokerUrl": "tcp://{{ include "openslice.fullname" . }}-artemis:61616?jms.watchTopicAdvisories=false", 
                   "spring.activemq.user": "{{ .Values.oscreds.activemq.user }}",  
                   "spring.activemq.password": "{{ .Values.oscreds.activemq.password }}", 
-                  "logging.level.org.springframework": "{{ .Values.spring.logLevel | default 'INFO' }}",
+                  "logging.level.org.springframework": "{{ .Values.spring.logLevel | default "INFO" }}",
                   "kroki.serverurl":"{{ .Values.rooturl }}/kroki"
                 }
           resources:
diff --git a/kubernetes/helm/openslice/templates/portalweb-config.yaml b/kubernetes/helm/openslice/templates/portalweb-config.yaml
index 10e8ade9dc6fcd6ac3291cdf33a033e0fd9b8a81..35e9c505477b945c3aef7f422b769140cd9525b5 100644
--- a/kubernetes/helm/openslice/templates/portalweb-config.yaml
+++ b/kubernetes/helm/openslice/templates/portalweb-config.yaml
@@ -10,4 +10,5 @@ metadata:
     {{- include "openslice.labels" . | nindent 4 }}
 data:
   config.js: |
-    {{- .Files.Get "files/org.etsi.osl.portal.web/src/js/config.js" | nindent 4 }}
+    {{- tpl (.Files.Get "files/org.etsi.osl.portal.web/src/js/config.js") . | nindent 4 }}
+    
\ No newline at end of file
diff --git a/kubernetes/helm/openslice/templates/portalweb.yaml b/kubernetes/helm/openslice/templates/portalweb.yaml
index 62b5d90fd4dcfaa7a2aaba56a69101cf399f8805..c2b22a10b01c00f22a850b9e951189c86e849fb4 100644
--- a/kubernetes/helm/openslice/templates/portalweb.yaml
+++ b/kubernetes/helm/openslice/templates/portalweb.yaml
@@ -27,6 +27,7 @@ spec:
       hostNetwork: {{ .Values.hostNetwork }}
       containers:
         - image: "{{ .Values.image.portalweb.repository }}:{{ .Values.image.portalweb.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.portalweb.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-portalweb
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
@@ -36,6 +37,10 @@ spec:
             - name: portalweb-configuration
               mountPath: /usr/share/nginx/html/nfvportal/js/config.js
               subPath: config.js
+          readinessProbe:
+            httpGet:
+              path: /tmf-api/serviceCatalogManagement/v4
+              port: 80
       volumes:
         - name: portalweb-configuration
           configMap:
diff --git a/kubernetes/helm/openslice/templates/tmfweb.yaml b/kubernetes/helm/openslice/templates/tmfweb.yaml
index 5ee897432d96423bec7cc1044835901b9e20f442..2d324ec79f2f34379c10d8b12ae10d3ad1cd493f 100644
--- a/kubernetes/helm/openslice/templates/tmfweb.yaml
+++ b/kubernetes/helm/openslice/templates/tmfweb.yaml
@@ -27,6 +27,7 @@ spec:
       hostNetwork: {{ .Values.hostNetwork }}
       containers:
         - image: "{{ .Values.image.tmfweb.repository }}:{{ .Values.image.tmfweb.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.tmfweb.pullPolicy | default "Always" }}
           name: {{ include "openslice.fullname" . }}-tmfweb
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index e2c73fb7974bd79db6664bee8e5f369478483b48..2f6cccaa56be85aaecd3fa3e7a233e03a00f9a46 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -7,74 +7,79 @@ replicaCount: 1
 image:
   artemis:
     repository: apache/activemq-artemis
-    pullPolicy: IfNotPresent
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     tag: "2.30.0"
   blockdiag:
     repository: yuzutech/kroki-blockdiag
-    pullPolicy: IfNotPresent
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     tag: "latest"
   bugzilla:
-    repository: openslice/org.etsi.osl.bugzilla
-    pullPolicy: IfNotPresent
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   centrallog:
-    repository: openslice/org.etsi.osl.centrallog.service
-    pullPolicy: IfNotPresent
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   keycloak:
-    repository: jboss/keycloak
-    pullPolicy: IfNotPresent
+    repository: quay.io/keycloak/keycloak
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     tag: "16.1.1"
   kroki:
     repository: yuzutech/kroki
-    pullPolicy: IfNotPresent
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     tag: "latest"
   manoclient:
-    repository: openslice/org.etsi.osl.mano
-    pullPolicy: IfNotPresent
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.mano
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   osom:
-    repository: openslice/org.etsi.osl.osom
-    pullPolicy: IfNotPresent
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.osom
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   portalapi:
-    repository: openslice/org.etsi.osl.portal.api
-    pullPolicy: IfNotPresent
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   osscapi:
-    repository: openslice/org.etsi.osl.tmf.api
-    pullPolicy: IfNotPresent
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   mysql:
     repository: mysql
-    pullPolicy: IfNotPresent
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     tag: "5.7.43"
   oasapi:
-    repository: openslice/org.etsi.osl.oas
-    pullPolicy: IfNotPresent
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.oas
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   portalweb:
-    repository: openslice/org.etsi.osl.portal.web
-    pullPolicy: IfNotPresent
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
   tmfweb:
-    repository: openslice/org.etsi.osl.tmf.web
-    pullPolicy: IfNotPresent
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web
+    pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
-    tag: "latest"
+    tag: "develop"
+  cridge:
+    repository: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge
+    pullPolicy: Always
+    # Overrides the image tag whose default is the chart appVersion.
+    tag: "develop"
 
 bugzillaurl: example.com:443/bugzilla
 bugzillakey: VH2Vw0iI5aYgALFFzVDWqhACwt6Hu3bXla9kSC1Z
@@ -107,6 +112,9 @@ spring:
 mysql:
   storage: 10Gi
   
+cridge:
+  mode: "DEBUG"
+  
 # Storage class to be used for provisioning. Default is manual
 # storageClass: ~
 
diff --git a/kubernetes/template/bugzilla.yaml b/kubernetes/template/bugzilla.yaml
index fe5c189c40e01bdad6054e9ec89a6c5db768c547..658d1028b6c1cbb39715af0dff019f28779e4c3a 100644
--- a/kubernetes/template/bugzilla.yaml
+++ b/kubernetes/template/bugzilla.yaml
@@ -27,7 +27,7 @@ spec:
                   "bugzillakey":"", 
                   "main_operations_product":"" 
                 }
-          image: openslice/org.etsi.osl.bugzilla:latest
+          image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop
           name: bugzilla
           ports:
             - containerPort: 13010
diff --git a/kubernetes/template/centrallog.yaml b/kubernetes/template/centrallog.yaml
index f4c902086266ecfb88e21a55e43e0175bff32dde..2fa6b276b6fb3e5ff8b37c90e9ebe89c267d2b15 100644
--- a/kubernetes/template/centrallog.yaml
+++ b/kubernetes/template/centrallog.yaml
@@ -25,7 +25,7 @@ spec:
                   "spring.activemq.password": "artemis", 
                   "centrallogurl":"http://elk_ip:elk_port/index_name/_doc" 
                 }
-          image: openslice/org.etsi.osl.centrallog.service:latest
+          image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop
           name: centrallog
           ports:
             - containerPort: 13013
diff --git a/kubernetes/template/manoclient.yaml b/kubernetes/template/manoclient.yaml
index 824f3b0532063757633b540e69c738e5646ce6bd..5c181dc7ebca85f53707a39529548a9542b77ae0 100644
--- a/kubernetes/template/manoclient.yaml
+++ b/kubernetes/template/manoclient.yaml
@@ -25,7 +25,7 @@ spec:
                   "spring.activemq.password": "artemis",
                   "logging.level.org.springframework" : "INFO"
                 }
-          image: openslice/org.etsi.osl.mano:latest
+          image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop
           name: manoclient
           ports:
             - containerPort: 13011
diff --git a/kubernetes/template/oasapi.yaml b/kubernetes/template/oasapi.yaml
index 8b1706a3cd22e5e990165e60f5f33fa13747536e..f494e3e748766750dd0f1c011f8f72e973d9ad44 100644
--- a/kubernetes/template/oasapi.yaml
+++ b/kubernetes/template/oasapi.yaml
@@ -46,7 +46,7 @@ spec:
                   "spring.activemq.password": "artemis", 
                   "logging.level.org.springframework" : "INFO" 
                 }
-          image: openslice/org.etsi.osl.oas:latest
+          image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop
           name: openslice-oasapi
           ports:
             - containerPort: 13101
diff --git a/kubernetes/template/osom.yaml b/kubernetes/template/osom.yaml
index 800dd624e68b5b055bd8c06fd7974bbff73d6c5b..d05010e79e60c15c6de465eff9e73a1255f7682d 100644
--- a/kubernetes/template/osom.yaml
+++ b/kubernetes/template/osom.yaml
@@ -27,7 +27,7 @@ spec:
                   "spring.activemq.password": "artemis", 
                   "logging.level.org.springframework" : "INFO" 
                 }
-          image: openslice/org.etsi.osl.osom:latest
+          image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop
           name: openslice-osom
           ports:
             - containerPort: 13100
diff --git a/kubernetes/template/osportalapi.yaml b/kubernetes/template/osportalapi.yaml
index dc4a59873fe936f82f4cd71b266bcc782c001d79..16995791bf30b2358e88ea0cf2385e137c9e898b 100644
--- a/kubernetes/template/osportalapi.yaml
+++ b/kubernetes/template/osportalapi.yaml
@@ -27,7 +27,7 @@ spec:
           command: ['sh', '-c', "until nslookup mysql; do echo waiting for mysql; sleep 2; done"]
       containers:
         - name: openslice-portalapi
-          image: openslice/org.etsi.osl.portal.api:latest
+          image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop
           ports:
             - containerPort: 13000
           volumeMounts:
diff --git a/kubernetes/template/osscapi.yaml b/kubernetes/template/osscapi.yaml
index 730e027537b449901e873a56844fb369e8f2999f..720c922066b04b91fab1358ce28997630907ad01 100644
--- a/kubernetes/template/osscapi.yaml
+++ b/kubernetes/template/osscapi.yaml
@@ -48,7 +48,7 @@ spec:
                   "logging.level.org.springframework":"INFO",
                   "kroki.serverurl":"http://INGRESSADDR/kroki"
                 }
-          image: openslice/org.etsi.osl.tmf.api:latest
+          image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop
           name: openslice-scapi
           ports:
             - containerPort: 13082
diff --git a/kubernetes/template/portalweb.yaml b/kubernetes/template/portalweb.yaml
index 630075e8c587c487cbed66889ff0873eadb17e0b..92106a9a65c0fbeb4cba44a833f228d799a1e804 100644
--- a/kubernetes/template/portalweb.yaml
+++ b/kubernetes/template/portalweb.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: openslice-portalweb
-          image: openslice/org.etsi.osl.portal.web:latest
+          image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.web:develop
           ports:
             - containerPort: 80
           volumeMounts:
diff --git a/kubernetes/template/tmfweb.yaml b/kubernetes/template/tmfweb.yaml
index 99295633dd69e65211c27e6733ecabdd5d4b72f8..a07b188fd8caf794695234f2cd8c8cfe29d935fa 100644
--- a/kubernetes/template/tmfweb.yaml
+++ b/kubernetes/template/tmfweb.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: openslice-tmfweb
-          image: openslice/org.etsi.osl.tmf.web:latest
+          image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.web:develop
           ports:
             - containerPort: 80
           volumeMounts: