diff --git a/.env b/.env
index baa6afe..c37b755 100644
--- a/.env
+++ b/.env
@@ -12,19 +12,19 @@
 #
 # Nginx configuration
 #
-NGINX_DEFAULT_CONF=./config/nginx_ohif.conf
+NGINX_DEFAULT_CONF=./config/ohif/nginx.conf
 
 #
 # OHIF Viewer
 #
-OHIF_CONFIG=./config/ohif.js
-OHIF_LOGO=./config/logo.png
+OHIF_CONFIG=./config/ohif/ohif.js
+OHIF_LOGO=./config/ohif/logo.png
 
 #
 # Orthanc core with plugins
 #
 ORTHANC_CONFIG=./config/orthanc.json
-ORTHANC_OHIF=./config/orthanc_ohif.js
+ORTHANC_OHIF=./config/ohif/ohif.js
 ORTHANC_DB_MNT=./volumes/orthanc_db
 ORTHANC_LOG=./volumes/orthanc_logs
 
diff --git a/docker-compose.yml b/docker-compose.yml
index e03a08f..5ec6a07 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,7 +52,7 @@ services:
     volumes:
       - ${ORTHANC_CONFIG:-./config/orthanc.json}:/etc/orthanc/orthanc.json:ro
       - ${ORTHANC_DB_MNT:-./volumes/orthanc_db}:/var/lib/orthanc/db
-      - ${ORTHANC_OHIF:-./config/orthanc_ohif.js}:/usr/local/share/orthanc/ohif.js:ro
+      - ${ORTHANC_OHIF:-./config/ohif/ohif.js}:/usr/local/share/orthanc/ohif.js:ro
       - ${ORTHANC_LOG:-./volumes/orthanc_logs}:/etc/orthanc/logs
     environment:
       VERBOSE_ENABLED: "true"