diff --git a/docker-compose-openelis.yml b/docker-compose-openelis.yml
index cb8b1ef..b3892a1 100644
--- a/docker-compose-openelis.yml
+++ b/docker-compose-openelis.yml
@@ -111,7 +111,7 @@ services:
 
   env-substitution:
     environment:
-      - OPENELIS_FHIR_SERVER_PUBLIC_URL=${SERVER_SCHEME}://${FHIR_OPENELIS_HOSTNAME}
+      - OPENELIS_FHIR_SERVER_PUBLIC_URL=${SERVER_SCHEME}://${FHIR_OPENELIS_HOSTNAME}/fhir/
       - OPENELIS_FHIR_SERVER_USERNAME=${OPENELIS_FHIR_SERVER_USERNAME}
       - OPENELIS_FHIR_SERVER_PASSWORD=${OPENELIS_FHIR_SERVER_PASSWORD}
       - ENABLE_SSO=${ENABLE_SSO}
diff --git a/scripts/utils.sh b/scripts/utils.sh
index 9173a92..ee757b7 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -198,7 +198,7 @@ function setNginxHostnames {
     export KEYCLOAK_HOSTNAME="${HOST_IP_ADDRESS:-localhost}:8084"
     export ORTHANC_HOSTNAME="${HOST_IP_ADDRESS:-localhost}:8889"
     export OPENELIS_HOSTNAME="${HOST_IP_ADDRESS:-localhost}"
-    export FHIR_OPENELIS_HOSTNAME="${HOST_IP_ADDRESS:-localhost}:9092"
+    export FHIR_OPENELIS_HOSTNAME="${HOST_IP_ADDRESS:-localhost}:9095"
     export BAHMNI_EMR_HOSTNAME="${HOST_IP_ADDRESS:-localhost}"
 
     echo "→ O3_HOSTNAME=$O3_HOSTNAME"