diff --git a/omec/5g-control-plane/templates/deployment-pcf.yaml b/omec/5g-control-plane/templates/deployment-pcf.yaml
index 1a2e470..6829ffe 100644
--- a/omec/5g-control-plane/templates/deployment-pcf.yaml
+++ b/omec/5g-control-plane/templates/deployment-pcf.yaml
@@ -53,10 +53,22 @@
         tty: true
         command: ["/free5gc/script/pcf-run.sh"]
         env:
+        - name: GRPC_GO_LOG_VERBOSITY_LEVEL
+          value: {{ .Values.config.grpc.golog_verbosity | quote }}
+        - name: GRPC_GO_LOG_SEVERITY_LEVEL
+          value: {{ .Values.config.grpc.severity | quote }}
+        - name: GRPC_TRACE
+          value: {{ .Values.config.grpc.trace | quote }}
+        - name: GRPC_VERBOSITY
+          value: {{ .Values.config.grpc.verbosity | quote }}
         - name: POD_IP
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
+      {{- if .Values.config.managedByConfigPod.enabled }}
+        - name: MANAGED_BY_CONFIG_POD 
+          value: "true"
+      {{- end }}
       {{- if .Values.resources.enabled }}
         resources:
 {{ toYaml .Values.resources.pcf | indent 10 }}