diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index e70b4bfb..63e90a8e 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -12,7 +12,7 @@ export PGAPPNAME=${HOSTNAME}
 
 # As docker-compose exec do not launch the entrypoint
 # init PG variable into .bashrc so it will be initialized
-# when doing docker-compose exec odoo gosu odoo bash
+# when doing docker-compose exec odoo odoo bash
 echo "
 export PGHOST=${DB_HOST}
 export PGPORT=${DB_PORT}
diff --git a/bin/list_dependencies.py b/bin/list_dependencies.py
index ef908d7d..b1ef7ca6 100755
--- a/bin/list_dependencies.py
+++ b/bin/list_dependencies.py
@@ -13,7 +13,7 @@
 import os
 import ast
 
-LOCAL_SRC_DIR = os.path.join("/odoo", "local-src")
+LOCAL_SRC_DIR = os.path.join("/odoo", "odoo", "addons")
 
 dependencies = set()
 local_modules = os.listdir(LOCAL_SRC_DIR)
diff --git a/bin/runtests b/bin/runtests
index b8acefd7..e3c566d3 100755
--- a/bin/runtests
+++ b/bin/runtests
@@ -30,7 +30,7 @@ set -e
 
 wait_postgres.sh
 
-LOCAL_SRC_DIR=/odoo/local-src
+LOCAL_SRC_DIR=/odoo/odoo/addons
 CACHE_DIR=${CACHE_DIR:=/tmp/cachedb}
 
 if [ -z $1 ]; then
@@ -73,7 +73,7 @@ else
         pg_dump -Fp -d $DB_NAME_TEST -O -f "$CACHED_DUMP"
     fi
 fi
-echo "🔧🔧 Install local-src modules 🔧🔧"
+echo "🔧🔧 Install odoo/addons modules 🔧🔧"
 odoo --stop-after-init --workers=0 --database $DB_NAME_TEST --test-enable --log-level=test --log-handler=":INFO" --without-demo="" --db-filter=$DB_NAME_TEST -i ${LOCAL_ADDONS}
 
 dropdb ${DB_NAME_TEST}
diff --git a/bin/testdb-gen b/bin/testdb-gen
index e4a1be4a..96bf0975 100755
--- a/bin/testdb-gen
+++ b/bin/testdb-gen
@@ -16,5 +16,5 @@ fi
 
 echo "creating database ${DB_NAME}"
 createdb -h ${DB_HOST} -O ${DB_USER} ${DB_NAME}
-gosu odoo odoo --stop-after-init --workers=0 --log-level=warn --without-demo="" "$@"
+odoo --stop-after-init --workers=0 --log-level=warn --without-demo="" "$@"
 echo "done"
diff --git a/bin/testdb-update b/bin/testdb-update
index a260d82c..3be15410 100755
--- a/bin/testdb-update
+++ b/bin/testdb-update
@@ -15,5 +15,5 @@ if ! psql -lqtA -h ${DB_HOST} | grep -q "^$DB_NAME|"; then
 fi
 
 echo "updating database ${DB_NAME}"
-gosu odoo odoo --stop-after-init --workers=0 --log-level=warn --without-demo="" "$@"
+odoo --stop-after-init --workers=0 --log-level=warn --without-demo="" "$@"
 echo "done"