diff --git a/templates/editoast/deployment.yaml b/templates/editoast/deployment.yaml
index 01e942d..ed54c0c 100644
--- a/templates/editoast/deployment.yaml
+++ b/templates/editoast/deployment.yaml
@@ -70,27 +70,27 @@ spec:
 
             - name: OSRD_MQ_URL
               {{- $amqp := .Values.endpoints.amqp.url }}
-              {{- if eq (typeOf $amqp) "map" }}
+              {{- if eq (kindOf $amqp) "map" }}
               valueFrom:
-                {{- toYaml $amqp.valueFrom | nindent 6 }}
+                {{- toYaml $amqp.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $amqp }}"
               {{- end }}
 
             - name: DATABASE_URL
               {{- $postgresql := .Values.endpoints.postgresql }}
-              {{- if eq (typeOf $postgresql) "map" }}
+              {{- if eq (kindOf $postgresql) "map" }}
               valueFrom:
-                {{- toYaml $postgresql.valueFrom | nindent 6 }}
+                {{- toYaml $postgresql.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $postgresql }}"
               {{- end }}
 
             - name: VALKEY_URL
               {{- $redis := .Values.endpoints.redis }}
-              {{- if eq (typeOf $redis) "map" }}
+              {{- if eq (kindOf $redis) "map" }}
               valueFrom:
-                {{- toYaml $redis.valueFrom | nindent 6 }}
+                {{- toYaml $redis.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $redis }}"
               {{- end }}
diff --git a/templates/editoast/migration_job.yaml b/templates/editoast/migration_job.yaml
index 59ea9ce..0519365 100644
--- a/templates/editoast/migration_job.yaml
+++ b/templates/editoast/migration_job.yaml
@@ -35,27 +35,27 @@ spec:
 
             - name: OSRD_MQ_URL
               {{- $amqp := .Values.endpoints.amqp.url }}
-              {{- if eq (typeOf $amqp) "map" }}
+              {{- if eq (kindOf $amqp) "map" }}
               valueFrom:
-                {{- toYaml $amqp.valueFrom | nindent 6 }}
+                {{- toYaml $amqp.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $amqp }}"
               {{- end }}
 
             - name: DATABASE_URL
               {{- $postgresql := .Values.endpoints.postgresql }}
-              {{- if eq (typeOf $postgresql) "map" }}
+              {{- if eq (kindOf $postgresql) "map" }}
               valueFrom:
-                {{- toYaml $postgresql.valueFrom | nindent 6 }}
+                {{- toYaml $postgresql.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $postgresql }}"
               {{- end }}
 
             - name: VALKEY_URL
               {{- $redis := .Values.endpoints.redis }}
-              {{- if eq (typeOf $redis) "map" }}
+              {{- if eq (kindOf $redis) "map" }}
               valueFrom:
-                {{- toYaml $redis.valueFrom | nindent 6 }}
+                {{- toYaml $redis.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $redis }}"
               {{- end }}
diff --git a/templates/osrdyne/deployment.yaml b/templates/osrdyne/deployment.yaml
index 778b01d..2319847 100644
--- a/templates/osrdyne/deployment.yaml
+++ b/templates/osrdyne/deployment.yaml
@@ -65,18 +65,18 @@ spec:
           env:
             - name: OSRDYNE__AMQP_URI
               {{- $amqp := .Values.endpoints.amqp.url }}
-              {{- if eq (typeOf $amqp) "map" }}
+              {{- if eq (kindOf $amqp) "map" }}
               valueFrom:
-                {{- toYaml $amqp.valueFrom | nindent 6 }}
+                {{- toYaml $amqp.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $amqp }}"
               {{- end }}
 
             - name: OSRDYNE__MANAGEMENT_URI
               {{- $amqpManagement := .Values.endpoints.amqp.management }}
-              {{- if eq (typeOf $amqpManagement) "map" }}
+              {{- if eq (kindOf $amqpManagement) "map" }}
               valueFrom:
-                {{- toYaml $amqpManagement.valueFrom | nindent 6 }}
+                {{- toYaml $amqpManagement.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $amqpManagement }}"
               {{- end }}
@@ -84,9 +84,9 @@ spec:
             {{- if (eq .Values.services.core.autoscaling.type "Keda") }}
             - name: OSRDYNE__WORKER_DRIVER__AUTOSCALING__AMQP_HOST
               {{- $amqpManagementWithVhost := .Values.endpoints.amqp.managementWithVhost }}
-              {{- if eq (typeOf $amqpManagementWithVhost) "map" }}
+              {{- if eq (kindOf $amqpManagementWithVhost) "map" }}
               valueFrom:
-                {{- toYaml $amqpManagementWithVhost.valueFrom | nindent 6 }}
+                {{- toYaml $amqpManagementWithVhost.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $amqpManagementWithVhost }}"
               {{- end }}
diff --git a/templates/stateful_editoast/deployment.yaml b/templates/stateful_editoast/deployment.yaml
index 0cfd3de..141660f 100644
--- a/templates/stateful_editoast/deployment.yaml
+++ b/templates/stateful_editoast/deployment.yaml
@@ -69,27 +69,27 @@ spec:
 
             - name: OSRD_MQ_URL
               {{- $amqp := .Values.endpoints.amqp.url }}
-              {{- if eq (typeOf $amqp) "map" }}
+              {{- if eq (kindOf $amqp) "map" }}
               valueFrom:
-                {{- toYaml $amqp.valueFrom | nindent 6 }}
+                {{- toYaml $amqp.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $amqp }}"
               {{- end }}
 
             - name: DATABASE_URL
               {{- $postgresql := .Values.endpoints.postgresql }}
-              {{- if eq (typeOf $postgresql) "map" }}
+              {{- if eq (kindOf $postgresql) "map" }}
               valueFrom:
-                {{- toYaml $postgresql.valueFrom | nindent 6 }}
+                {{- toYaml $postgresql.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $postgresql }}"
               {{- end }}
 
             - name: VALKEY_URL
               {{- $redis := .Values.endpoints.redis }}
-              {{- if eq (typeOf $redis) "map" }}
+              {{- if eq (kindOf $redis) "map" }}
               valueFrom:
-                {{- toYaml $redis.valueFrom | nindent 6 }}
+                {{- toYaml $redis.valueFrom | nindent 16 }}
               {{- else }}
               value: "{{ $redis }}"
               {{- end }}