diff --git a/Makefile b/Makefile
index 806c4863df..79666b35e3 100644
--- a/Makefile
+++ b/Makefile
@@ -154,15 +154,15 @@ docker-compose-up:
 	docker compose -f ./infra/docker/docker-compose.cypress.yml up --quiet-pull flyway
 	docker compose -f ./infra/docker/docker-compose.cypress.yml up -d --quiet-pull app
 	@printf 'Waiting for backend app to be ready'
-	@until curl --output /dev/null --silent --fail "http://localhost:8880/bff/v1/healthcheck"; do printf '.' && sleep 1; done
+	@until curl --output /dev/null --silent --fail "http://localhost:8880/api/v1/healthcheck"; do printf '.' && sleep 1; done
 
 docker-compose-puppeteer-up: docker-env
 	docker compose -f ./infra/docker/docker-compose.puppeteer.yml up -d monitorenv-app
 	docker compose -f ./infra/docker/docker-compose.puppeteer.yml up -d monitorfish-app
 	@printf 'Waiting for MonitorEnv app to be ready'
-	@until curl --output /dev/null --silent --fail "http://localhost:9880/bff/v1/healthcheck"; do printf '.' && sleep 1; done
+	@until curl --output /dev/null --silent --fail "http://localhost:9880/api/v1/healthcheck"; do printf '.' && sleep 1; done
 	@printf 'Waiting for MonitorFish app to be ready'
-	@until curl --output /dev/null --silent --fail "http://localhost:8880/bff/v1/healthcheck"; do printf '.' && sleep 1; done
+	@until curl --output /dev/null --silent --fail "http://localhost:8880/api/v1/healthcheck"; do printf '.' && sleep 1; done
 
 # ----------------------------------------------------------
 # CI: Pipeline Commands
diff --git a/infra/docker/docker-compose.cypress.yml b/infra/docker/docker-compose.cypress.yml
index c6203beda3..4872bebc8c 100644
--- a/infra/docker/docker-compose.cypress.yml
+++ b/infra/docker/docker-compose.cypress.yml
@@ -25,7 +25,7 @@ services:
         condition: service_healthy
 
   app:
-    image: monitorfish-app:$MONITORFISH_VERSION
+    image: monitorfish-app:v1.59.4_snapshot
     container_name: monitorfish_backend
     environment:
       - ENV_DB_URL=jdbc:postgresql://db:5432/monitorfishdb?user=postgres&password=postgres
@@ -40,6 +40,7 @@ services:
       - FRONTEND_MONITORENV_URL=http://0.0.0.0:8081
       - FRONTEND_OIDC_AUTHORITY=https://authentification.recette.din.developpement-durable.gouv.fr/authSAML/oidc/monitorfish
       - FRONTEND_OIDC_CLIENT_ID=monitorfish
+      - MONITORFISH_OIDC_ENABLED=false
       - FRONTEND_OIDC_ENABLED=false
       - FRONTEND_OIDC_REDIRECT_URI=https://monitorfish.din.developpement-durable.gouv.fr
       - FRONTEND_OIDC_LOGOUT_REDIRECT_URI=https://monitorfish.din.developpement-durable.gouv.fr
diff --git a/infra/docker/docker-compose.puppeteer.yml b/infra/docker/docker-compose.puppeteer.yml
index 283316c489..13414f13ea 100644
--- a/infra/docker/docker-compose.puppeteer.yml
+++ b/infra/docker/docker-compose.puppeteer.yml
@@ -56,6 +56,7 @@ services:
       - FRONTEND_MONITORENV_URL=http://0.0.0.0:9880
       - FRONTEND_OIDC_AUTHORITY=https://authentification.recette.din.developpement-durable.gouv.fr/authSAML/oidc/monitorfish
       - FRONTEND_OIDC_CLIENT_ID=monitorfish
+      - MONITORFISH_OIDC_ENABLED=false
       - FRONTEND_OIDC_ENABLED=false
       - FRONTEND_OIDC_REDIRECT_URI=https://monitorfish.din.developpement-durable.gouv.fr
       - FRONTEND_OIDC_LOGOUT_REDIRECT_URI=https://monitorfish.din.developpement-durable.gouv.fr