diff --git a/docker/build-container.sh b/docker/build-container.sh
index 1425fa30d0f0150151a93b242ea67aac270a50d8..be8c683f7b5e7fac52c09f413b732b6ff3dd030e 100755
--- a/docker/build-container.sh
+++ b/docker/build-container.sh
@@ -3,20 +3,25 @@
 # See: https://forge.etsi.org/etsi-forge-copyright-statement.txt
 
 #set -e
-#set -vx
+set -vx
 
 DOCKER_FILE=./docker/Dockerfile
 if [ -f ${DOCKER_FILE} ]
 then
-    docker rm --force stf569_Mec
-    docker build --tag stf569_Mec --force-rm -f ${DOCKER_FILE} .
+    #check and build stf569_mec image
+    DOCKER_ID=`docker ps -a | grep -e stf569_mec | awk '{ print $1 }'`
+    if [ ! -z "${DOCKER_ID}" ]
+    then
+        docker rm --force stf569_mec
+    fi
+    docker build --tag stf569_mec --force-rm -f ${DOCKER_FILE} .
     if [ "$?" != "0" ]
     then
         echo "Docker build failed: $?"
         exit -1
     fi
     docker image ls -a
-    docker inspect stf569_Mec:latest
+    docker inspect stf569_mec:latest
     if [ "$?" != "0" ]
     then
         echo "Docker inspect failed: $?"
diff --git a/docker/run-container.sh b/docker/run-container.sh
index 4b41de3b9b04b5a4d9ac9c0d723eff6e8a5fe59a..9ad8ae98d817f77b3275ebaabc16e26ef896f832 100755
--- a/docker/run-container.sh
+++ b/docker/run-container.sh
@@ -5,9 +5,9 @@
 #set -e
 #set -vx
 
-docker run stf569_Mec:latest "/bin/bash" \
+docker run stf569_mec:latest "/bin/bash" \
 	-c "source /home/etsi/devenv.bash \
-	    && cd /home/etsi/dev/etsi_emcom/src/AtsMec/objs \
+	    && cd /home/etsi/dev/etsi_mec/src/AtsMec/objs \
 	    && ../bin/run_all.bash \
       && ls -ltr ../logs"