diff --git a/conf/release.sh b/conf/release.sh
index c7140b3d2..972c802d1 100755
--- a/conf/release.sh
+++ b/conf/release.sh
@@ -50,5 +50,5 @@ if [[ "${confirm}" = "y" ]]; then
     cd "${ROOT_DIR}" && docker pushrm olivierkorach/sonar-tools
 
     echo "Running scan"
-    "${CONF_DIR}/scan.sh" -test
+    "${CONF_DIR}/run_all.sh" -test
 fi
\ No newline at end of file
diff --git a/conf/run_tests.sh b/conf/run_tests.sh
index af470a9ff..1f50fe679 100755
--- a/conf/run_tests.sh
+++ b/conf/run_tests.sh
@@ -45,7 +45,7 @@ do
     if [[ -d "${ROOT_DIR}/${GEN_LOC}/${target}/" ]]; then
         # Recreate a fresh TESTSYNC project for sync tests
         curl -X POST -u "${SONAR_TOKEN_TEST_ADMIN_USER}:" "${SONAR_HOST_URL_TEST}/api/projects/delete?project=${SYNC_PROJECT_KEY}"
-        conf/scan.sh -nolint -Dsonar.host.url="${SONAR_HOST_URL_TEST}" -Dsonar.projectKey="${SYNC_PROJECT_KEY}" -Dsonar.projectName="${SYNC_PROJECT_KEY}" -Dsonar.token="${SONAR_TOKEN_TEST_ADMIN_ANALYSIS}"
+        conf/run_scanner.sh -Dsonar.host.url="${SONAR_HOST_URL_TEST}" -Dsonar.projectKey="${SYNC_PROJECT_KEY}" -Dsonar.projectName="${SYNC_PROJECT_KEY}" -Dsonar.token="${SONAR_TOKEN_TEST_ADMIN_ANALYSIS}"
         # Run tests
         poetry run coverage run --branch --source="${ROOT_DIR}" -m pytest "${ROOT_DIR}/${GEN_LOC}/${target}/" --junit-xml="${BUILD_DIR}/xunit-results-${target}.xml"
         poetry run coverage xml -o "${BUILD_DIR}/coverage-${target}.xml"
diff --git a/migration/build.sh b/migration/build.sh
index fa94662eb..850e7bd33 100755
--- a/migration/build.sh
+++ b/migration/build.sh
@@ -23,8 +23,6 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 CONF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 build_image=1
-release=0
-release_docker=0
 
 while [[ $# -ne 0 ]]; do
     case "${1}" in
diff --git a/test/test-sync.sh b/test/test-sync.sh
index ef2b221f4..520310608 100755
--- a/test/test-sync.sh
+++ b/test/test-sync.sh
@@ -4,9 +4,9 @@ for proj in source target
 do
    curl -X POST -u "$SONAR_TOKEN:" "$SONAR_HOST_URL/api/projects/delete?project=$proj"
    opts=("-Dsonar.projectKey=$proj" "-Dsonar.projectName=$proj")
-   scan.sh "${opts[@]}" "$@"
+   conf/run_all.sh "${opts[@]}" "$@"
    for branch in release-1.x release-2.x
    do
-      scan.sh "${opts[@]}" "$@" "-Dsonar.branch.name=$branch"
+      conf/run_all.sh "${opts[@]}" "$@" "-Dsonar.branch.name=$branch"
    done
 done