diff --git a/services/package.json b/services/package.json
index 3939bf8c4..35dee6c40 100644
--- a/services/package.json
+++ b/services/package.json
@@ -1,13 +1,13 @@
 {
   "name": "services",
   "version": "1.0.0",
   "private": true,
   "license": "BSD-3-Clause",
   "scripts": {
-    "build-base-image": "cd .. && ./services/scripts/build_base_image.sh ./services/base-image && cd -",
-    "build-tunnelbroker-base": "cd .. && ./services/scripts/build_base_image.sh ./services/tunnelbroker/docker-base && cd -",
-    "run-tunnelbroker-server": "cd .. && ./services/scripts/run_server_image.sh ./services/tunnelbroker/docker-server --overwrite && cd -",
-    "build-backup-base": "cd .. && ./services/scripts/build_base_image.sh ./services/backup/docker-base && cd -",
-    "run-backup-server": "cd .. &&  ./services/scripts/run_server_image.sh ./services/backup/docker-server --overwrite && cd -"
+    "build-base-image": "cd .. && ./services/scripts/build_base_image.sh ./services/base-image",
+    "build-tunnelbroker-base": "cd .. && ./services/scripts/build_base_image.sh ./services/tunnelbroker/docker-base",
+    "run-tunnelbroker-server": "cd .. && ./services/scripts/run_server_image.sh ./services/tunnelbroker/docker-server",
+    "build-backup-base": "cd .. && ./services/scripts/build_base_image.sh ./services/backup/docker-base",
+    "run-backup-server": "cd .. &&  ./services/scripts/run_server_image.sh ./services/backup/docker-server"
   }
 }
diff --git a/services/scripts/run_server_image.sh b/services/scripts/run_server_image.sh
index 3ef455719..ddee1176e 100755
--- a/services/scripts/run_server_image.sh
+++ b/services/scripts/run_server_image.sh
@@ -1,63 +1,65 @@
 #/bin/bash
 
 set -e
 
 # this script should be run from the comm's root directory
 
 if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then
   echo "Illegal number of parameters, expected:"
   echo "- one argument with a path to a directory containing Dockerfile and a config file"
-  echo "- one optional argument --overwrite"
+  echo "- one optional argument `port`"
+  echo "- example: `./services/scripts/run_server_image.sh ./services/tunnelbroker/docker-server 12345`"
+  exit 1;
+fi
+
+PORT="50051"
+if [ ! -z "$2" ]; then
+  PORT=$2
+fi
+
+re='^[0-9]+$'
+if [[ ! "$PORT" =~ $re ]]; then
+  echo "given port value [$PORT] is not a number, aborting"
   exit 1;
 fi
 
 GIVEN_PATH=$1
 CONFIG_PATH=$GIVEN_PATH/config.sh
 DOCKERFILE_PATH=$GIVEN_PATH/Dockerfile
 
 if [ ! -f $CONFIG_PATH ]; then
   echo "Config file not found in $GIVEN_PATH, it has to be named \`config.sh\`"
   exit 1;
 fi
 
 if [ ! -f $DOCKERFILE_PATH ]; then
   echo "Dockerfile not found in $GIVEN_PATH"
   exit 1;
 fi
 
 echo "reading configuration from $GIVEN_PATH"
 source $CONFIG_PATH
 
 CONTAINERS_IDS=$(docker ps -aq -f ancestor=$IMAGE_NAME:$VERSION)
 NCONTAINERS=$(docker ps -aq -f ancestor=$IMAGE_NAME:$VERSION | wc -l | sed 's/ //g')
 
 if [[ $NCONTAINERS -gt 1 ]]
 then
   echo "There's more than one container of '$IMAGE_NAME' image. Due to possible large sizes of containers creating a new one will be aborted now. Please remove containers manually and run this script again."
   echo "You can run:"
   echo "docker stop $(echo $CONTAINERS_IDS) && docker rm $(echo $CONTAINERS_IDS)"
   exit 0;
 elif [[ $NCONTAINERS -eq 1 ]]
 then
   echo "A container of image $IMAGE_NAME already exists(container id: $CONTAINERS_IDS)."
-  if [[ $2 == "--overwrite" ]]
-  then
-    echo "Overwriting an existing image"
-    docker stop $(echo $CONTAINERS_IDS) && docker rm $(echo $CONTAINERS_IDS)
-    docker rmi $IMAGE_NAME:$VERSION
-
-    docker build -t $IMAGE_NAME:$VERSION -f $DOCKERFILE_PATH .
-    docker run -it -p 50051:50051 $EXTRA_ARGS $IMAGE_NAME:$VERSION
-  else
-    echo "A new one will not be created, the current one will be used."
-    echo "If you encounter errors, please remove this container manually and re-run this script."
-    echo "To remove this container, you can run:"
-    echo "docker stop $(echo $CONTAINERS_IDS) && docker rm $(echo $CONTAINERS_IDS)"
-    docker start $CONTAINERS_IDS
-    docker attach $CONTAINERS_IDS
-  fi
+  echo "Overwriting an existing image"
+  docker stop $(echo $CONTAINERS_IDS) && docker rm $(echo $CONTAINERS_IDS)
+  docker rmi $IMAGE_NAME:$VERSION
+
+  docker build -t $IMAGE_NAME:$VERSION -f $DOCKERFILE_PATH .
+  docker run -it -p $PORT:50051 $EXTRA_ARGS $IMAGE_NAME:$VERSION
 else
   echo "Creating a new container for image $IMAGE_NAME"
   docker build -t $IMAGE_NAME:$VERSION -f $DOCKERFILE_PATH .
-  docker run -it -p 50051:50051 $EXTRA_ARGS $IMAGE_NAME:$VERSION
+  docker run -it -p $PORT:50051 $EXTRA_ARGS $IMAGE_NAME:$VERSION
 fi