diff --git a/docker/generic/README.md b/docker/generic/README.md
index eee32940e84..14c1f84dafb 100644
--- a/docker/generic/README.md
+++ b/docker/generic/README.md
@@ -19,14 +19,16 @@ $ sh build.sh kinetic
 
 ## How to Run
 ```
-# Default shared directory path is /home/$USER/shared_dir
-
 # Ubuntu 14.04 (Indigo)
-$ sh run.sh indigo
+$ ./run.sh -t latest-indigo
 
 # Ubuntu 16.04 (Kinetic)
-$ sh run.sh kinetic
-
-# If you select your shared directory path
-$ sh run.sh indigo|kinetic {SHARED_DIR_PATH}
+$ ./run.sh -t latest-kinetic
 ```
+
+|Option|Default|Description|
+|---|---|---|
+|-h||Show `Usage: $0 [-t <tag>] [-r <repo>] [-s <Shared directory>]`|
+|-t|latest-kinetic|Specify tag|
+|-r|autoware/autoware|Specify repo|
+|-s|/home/$USER/shared_dir|Specify shared dir|
diff --git a/docker/generic/run.sh b/docker/generic/run.sh
index 9d83abc72b1..e0b7cc73486 100755
--- a/docker/generic/run.sh
+++ b/docker/generic/run.sh
@@ -1,25 +1,42 @@
-#!/bin/sh
+#!/bin/bash
 
+usage() { echo "Usage: $0 [-t <tag>] [-r <repo>] [-s <Shared directory>]" 1>&2; exit 1; }
+
+# Defaults
 XSOCK=/tmp/.X11-unix
 XAUTH=/home/$USER/.Xauthority
 SHARED_DIR=/home/autoware/shared_dir
 HOST_DIR=/home/$USER/shared_dir
+DOCKER_HUB_REPO="autoware/autoware"
+TAG="latest-kinetic"
 
-if [ "$1" = "kinetic" ] || [ "$1" = "indigo" ]
-then
-    echo "Use $1"
-else
-    echo "Select distribution, kinetic|indigo"
-    exit
-fi
+while getopts ":ht:r:s:" opt; do
+  case $opt in
+    h)
+      usage
+      exit
+      ;;
+    t)
+      TAG=$OPTARG
+      ;;
+    r )
+      DOCKER_HUB_REPO=$OPTARG
+      ;;
+    s)
+      HOST_DIR=$OPTARG
+      ;;
+    \?)
+      echo "Invalid option: -$OPTARG" >&2
+      exit 1
+      ;;
+    :)
+      echo "Option -$OPTARG requires an argument." >&2
+      exit 1
+      ;;
+  esac
+done
 
-if [ "$2" = "" ]
-then
-    # Create Shared Folder
-    mkdir -p $HOST_DIR
-else
-    HOST_DIR=$2
-fi
+echo "Using $DOCKER_HUB_REPO:$TAG"
 echo "Shared directory: ${HOST_DIR}"
 
 nvidia-docker run \
@@ -32,4 +49,4 @@ nvidia-docker run \
     -u autoware \
     --privileged -v /dev/bus/usb:/dev/bus/usb \
     --net=host \
-    autoware-$1
+    $DOCKER_HUB_REPO:$TAG