diff --git a/kubernetes/helm/openslice/templates/cridge-config.yaml b/kubernetes/helm/openslice/templates/cridge-secret.yaml
similarity index 61%
rename from kubernetes/helm/openslice/templates/cridge-config.yaml
rename to kubernetes/helm/openslice/templates/cridge-secret.yaml
index 2c62c9a4b728e1fbaef442af56fe08dd6a30d585..e790b53f3805b47a66bfb75d3e34f0af18a24590 100644
--- a/kubernetes/helm/openslice/templates/cridge-config.yaml
+++ b/kubernetes/helm/openslice/templates/cridge-secret.yaml
@@ -1,5 +1,6 @@
+{{- $kubeconfig := .Values.kubeconfig | default (.Files.Get "files/org.etsi.osl.cridge/kubeconfig.yaml") -}}
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
@@ -8,6 +9,7 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
   name: {{ include "openslice.fullname" . }}-cridge-kubeconfig
+type: Opaque
 data:
   config: |-
-    {{- .Files.Get "files/org.etsi.osl.cridge/config" | nindent 4 }}
+    {{- required "A kubeconfig file is required." ($kubeconfig | b64enc) | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml
index 5e558467581532ef544ef89545b3216cc76f99bf..aebb4397723b45d2fdc82e589c0bcf5145aebc47 100644
--- a/kubernetes/helm/openslice/templates/cridge.yaml
+++ b/kubernetes/helm/openslice/templates/cridge.yaml
@@ -24,10 +24,6 @@ spec:
         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" }}
@@ -51,5 +47,5 @@ spec:
       restartPolicy: Always
       volumes:
         - name: cridge-kubeconfig
-          configMap:
-            name: {{ include "openslice.fullname" . }}-cridge-kubeconfig
+          secret:
+            secretName: {{ include "openslice.fullname" . }}-cridge-kubeconfig