diff --git a/host-files/docker-compose.yml b/host-files/docker-compose.yml
index d284d895fdb8129f0f0d5c2213fdc146ee331f19..349769e3338f9902edecc9b2ed8d2df24d500c7d 100644
--- a/host-files/docker-compose.yml
+++ b/host-files/docker-compose.yml
@@ -22,8 +22,8 @@ services:
       - POSTGRES_USER=${DBPROJECT_USER}
       - POSTGRES_PASSWORD=${DBPROJECT_PASSWORD}
 
-  esap_db:
-    image: esap_db:latest
+  esap-db:
+    image: esap-db:latest
     container_name: esap-db
     stdin_open: true  # docker run -i
     tty: true         # docker run -t
diff --git a/host-files/run-tests.sh b/host-files/run-tests.sh
index cce4772bda6311f608c683d0616d94e41b228e78..06b94ea6bc3d2d1b603708a9099a1b3cab4a8f4f 100755
--- a/host-files/run-tests.sh
+++ b/host-files/run-tests.sh
@@ -6,5 +6,5 @@ set -e
 export ESAP_DB_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 ESAP_RUN_OPTIONS="-d" ${ESAP_DB_PATH}/run.sh
-docker-compose -f ${ESAP_DB_PATH}/docker-stack.yml exec -T esap_db bash /code/scripts/run-tests.sh "$@"
+docker-compose -f ${ESAP_DB_PATH}/docker-stack.yml exec -T esap-db bash /code/scripts/run-tests.sh "$@"
 docker-compose -f ${ESAP_DB_PATH}/docker-stack.yml down -v --remove-orphans