diff --git a/scripts/mysql/common.sh b/scripts/mysql/common.sh
index d10c45f3e7..a9cafd07e6 100644
--- a/scripts/mysql/common.sh
+++ b/scripts/mysql/common.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -xe
 CONTAINER_NAME=alfresco-db-mysql
 
 MYSQL_USER=alfresco
@@ -6,13 +7,4 @@ MYSQL_ROOT_PASSWORD=alfresco
 MYSQL_DATABASE=alfresco
 
 MYSQL_HOST=127.0.0.1
-MYSQL_PORT=3306
-
-usage () {
-    echo "Usage: $0 <image>"
-}
-
-if [[ $# -ne 1 ]]; then
-    usage
-    exit 1
-fi
\ No newline at end of file
+MYSQL_PORT=3306
\ No newline at end of file
diff --git a/scripts/mysql/start.sh b/scripts/mysql/start.sh
index 8a4fcfb71a..fcb8934aa2 100644
--- a/scripts/mysql/start.sh
+++ b/scripts/mysql/start.sh
@@ -2,7 +2,7 @@
 set -e
 DIRECTORY=`dirname $0`
 echo $DIRECTORY
-. $(dirname $0)/common.sh
+ $(dirname "${BASH_SOURCE[0]}")/common.sh
 
 echo "============================================"
 echo "Generate custom config file"