diff --git a/run.sh b/run.sh
index 95ce2de1..c48653b0 100755
--- a/run.sh
+++ b/run.sh
@@ -152,6 +152,7 @@ if [ "${COMMAND}" = "start" ]; then
     # Start Docker container
     if [ "${IMAGE_TYPE}" = "standalone" ]; then
         IMG_NAME=$(echo "${PREFIX}-${ASIC_TYPE}-${TARGET}" | tr '[:upper:]' '[:lower:]')
+        docker rm -f ${IMG_NAME}-run
         docker run --name ${IMG_NAME}-run \
             -v $(pwd):/sai-challenger \
             --cap-add=NET_ADMIN \
@@ -159,12 +160,14 @@ if [ "${COMMAND}" = "start" ]; then
             --device /dev/net/tun:/dev/net/tun \
             -d ${IMG_NAME}
     elif [ "${IMAGE_TYPE}" = "server" ]; then
+        docker rm -f sc-server-${ASIC_TYPE}-${TARGET}-run
         docker run --name sc-server-${ASIC_TYPE}-${TARGET}-run \
             --cap-add=NET_ADMIN \
             ${OPTS} \
             --device /dev/net/tun:/dev/net/tun \
             -d sc-server-${ASIC_TYPE}-${TARGET}
     else
+        docker rm -f ${PREFIX}-client-run
         docker run --name ${PREFIX}-client-run \
             -v $(pwd):/sai-challenger \
             --cap-add=NET_ADMIN \