diff --git a/templates/editoast/deployment.yaml b/templates/editoast/deployment.yaml
index 7fe4970..67e1a2b 100644
--- a/templates/editoast/deployment.yaml
+++ b/templates/editoast/deployment.yaml
@@ -99,9 +99,7 @@ spec:
               {{- end }}
 
             - name: EDITOAST_OPENFGA_URL
-              value: "http://{{ include "osrd.fullname" . }}-openfga"
-            - name: EDITOAST_OPENFGA_STORE
-              value: osrd-editoast
+              value: "http://{{ include "osrd.fullname" . }}-openfga:{{ .Values.services.openfga.service.port }}"
 
             {{- with .Values.services.editoast.env | default dict }}
             {{- toYaml . | nindent 12 }}
diff --git a/templates/openfga/deployment.yaml b/templates/openfga/deployment.yaml
index 1b4ab7e..8ff813e 100644
--- a/templates/openfga/deployment.yaml
+++ b/templates/openfga/deployment.yaml
@@ -29,7 +29,8 @@ spec:
       initContainers:
         - name: openfga-migrate
           image: "{{ .Values.images.openfga }}"
-          command: ["openfga", "migrate"]
+          command: ["/openfga"]
+          args: ["migrate"]
           env:
             - name: OPENFGA_DATASTORE_ENGINE
               value: "postgres"
@@ -45,6 +46,8 @@ spec:
       containers:
         - name: openfga
           image: "{{ .Values.images.openfga }}"
+          command: ["/openfga"]
+          args: ["run"]
           ports:
             - containerPort: {{ .Values.services.openfga.service.targetPort }}
           env:
diff --git a/templates/stateful_editoast/deployment.yaml b/templates/stateful_editoast/deployment.yaml
index e61f1a4..8891c2f 100644
--- a/templates/stateful_editoast/deployment.yaml
+++ b/templates/stateful_editoast/deployment.yaml
@@ -99,7 +99,7 @@ spec:
               {{- end }}
 
             - name: EDITOAST_OPENFGA_URL
-              value: "http://{{ include "osrd.fullname" . }}-openfga"
+              value: "http://{{ include "osrd.fullname" . }}-openfga:{{ .Values.services.openfga.service.port }}"
 
             {{- with .Values.services.editoast.env | default dict }}
             {{- toYaml . | nindent 12 }}
diff --git a/values.yaml b/values.yaml
index a7f1ad4..1ea6dfa 100644
--- a/values.yaml
+++ b/values.yaml
@@ -42,7 +42,7 @@ services:
     service:
       type: ClusterIP
       port: 80
-      targetPort: 80
+      targetPort: 8080
     readinessProbe:
       disabled: false
       initialDelaySeconds: 5