diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 3900f5e46df159292206248a10382d6f10718bbd..8df821861191a7bf3704454be46525f408a8a187 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -89,7 +89,7 @@ services:
       - --mysqld.address=data-db:3306
       - --config.my-cnf=/.my.cnf
     volumes:
-      - ./dbrepo-data-db/metrics.cnf:/.my.cnf
+      - ./config/metrics.cnf:/.my.cnf
     healthcheck:
       test: -h
       <<: *healthcheck-params
@@ -381,7 +381,7 @@ services:
     ports:
       - "80:8080"
     volumes:
-      - ./conf/dbrepo.conf:/opt/bitnami/nginx/conf/server_blocks/dbrepo.conf:ro
+      - ./config/dbrepo.conf:/opt/bitnami/nginx/conf/server_blocks/dbrepo.conf:ro
     depends_on:
       dbrepo-analyse-service:
         condition: service_healthy
diff --git a/docker-compose.yml b/docker-compose.yml
index 524fba056261754b3c7af651c7e85c687e178088..33ef52a7b016601865a50f517a72267ce49033d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -365,8 +365,8 @@ services:
     build:
       context: ./dbrepo-ui
       args:
-        APP_VERSION: ${APP_VERSION:-latest}
-        COMMIT: ${CI_COMMIT_SHA:-}
+        APP_VERSION: ${CI_COMMIT_TAG:-latest}
+        COMMIT: ${CI_COMMIT_SHORT_SHA:-}
       network: host
     environment:
       NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"