diff --git a/NodeBase/etc/service/sel-node/run b/NodeBase/etc/service/sel-node/run
index 4b8dbbd2e..2079eca52 100644
--- a/NodeBase/etc/service/sel-node/run
+++ b/NodeBase/etc/service/sel-node/run
@@ -5,18 +5,16 @@ ADDR=localhost
 PORT=4444
 
 if [ -n "$HUB_PORT_4444_TCP_ADDR" ]; then
-	ADDR=$HUB_PORT_4444_TCP_ADDR
+  ADDR=$HUB_PORT_4444_TCP_ADDR
 fi
 
 if [ -n "$HUB_PORT_4444_TCP_PORT" ]; then
-	PORT=$HUB_PORT_4444_TCP_PORT
+  PORT=$HUB_PORT_4444_TCP_PORT
 fi
 
 sudo -E -i -u seluser \
   java -jar /opt/selenium/selenium-server-standalone.jar \
     -role node \
     -hub http://$ADDR:$PORT/grid/register \
-		-nodeConfig /opt/selenium/config.json
-    -Dwebdriver.chrome.args="--no-sandbox" \
-    -Dselenium.chrome.args="--no-sandbox" \
+    -nodeConfig /opt/selenium/config.json \
     | tee $NODE_LOG
diff --git a/README.md b/README.md
index 7d547e55e..faeee4a06 100644
--- a/README.md
+++ b/README.md
@@ -73,16 +73,6 @@ I like to remove the containers after each e2e test with `--rm` since this docke
 
 A dynamic port will be binded to the container ones, i.e.
 
-When you send your capabilities request for chrome be sure in include the `--no-sandbox` argument to be used when launching Chrome, for example:
-
-```
-options = webdriver.ChromeOptions()
-options.add_argument("--no-sandbox")
-driver = webdriver.Remote(command_executor='http://127.0.0.1:4444/wd/hub',desired_capabilities=options.to_capabilities())
-driver.get("http://www.python.org")
-print(driver.title)
-```
-
 ``` bash
 # Obtain the selenium port you'll connect to:
 docker port selenium-hub 4444
diff --git a/build/chrome/chrome_launcher.sh b/build/chrome/chrome_launcher.sh
new file mode 100644
index 000000000..5e8aacceb
--- /dev/null
+++ b/build/chrome/chrome_launcher.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Let the wrapped binary know that it has been run through the wrapper.
+export CHROME_WRAPPER="`readlink -f "$0"`"
+
+HERE="`dirname "$CHROME_WRAPPER"`"
+
+# Check if the CPU supports SSE2. If not, try to pop up a dialog to explain the
+# problem and exit. Otherwise the browser will just crash with a SIGILL.
+# http://crbug.com/348761
+grep ^flags /proc/cpuinfo|grep -qs sse2
+if [ $? != 0 ]; then
+  SSE2_DEPRECATION_MSG="This computer can no longer run Google Chrome because \
+its hardware is no longer supported."
+  if which zenity &> /dev/null; then
+    zenity --warning --text="$SSE2_DEPRECATION_MSG"
+  elif which gmessage &> /dev/null; then
+    gmessage "$SSE2_DEPRECATION_MSG"
+  elif which xmessage &> /dev/null; then
+    xmessage "$SSE2_DEPRECATION_MSG"
+  else
+    echo "$SSE2_DEPRECATION_MSG" 1>&2
+  fi
+  exit 1
+fi
+
+# We include some xdg utilities next to the binary, and we want to prefer them
+# over the system versions when we know the system versions are very old. We
+# detect whether the system xdg utilities are sufficiently new to be likely to
+# work for us by looking for xdg-settings. If we find it, we leave $PATH alone,
+# so that the system xdg utilities (including any distro patches) will be used.
+if ! which xdg-settings &> /dev/null; then
+  # Old xdg utilities. Prepend $HERE to $PATH to use ours instead.
+  export PATH="$HERE:$PATH"
+else
+  # Use system xdg utilities. But first create mimeapps.list if it doesn't
+  # exist; some systems have bugs in xdg-mime that make it fail without it.
+  xdg_app_dir="${XDG_DATA_HOME:-$HOME/.local/share/applications}"
+  mkdir -p "$xdg_app_dir"
+  [ -f "$xdg_app_dir/mimeapps.list" ] || touch "$xdg_app_dir/mimeapps.list"
+fi
+
+# Always use our versions of ffmpeg libs.
+# This also makes RPMs find the compatibly-named library symlinks.
+if [[ -n "$LD_LIBRARY_PATH" ]]; then
+  LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH"
+else
+  LD_LIBRARY_PATH="$HERE:$HERE/lib"
+fi
+export LD_LIBRARY_PATH
+
+export CHROME_VERSION_EXTRA="stable"
+
+# We don't want bug-buddy intercepting our crashes. http://crbug.com/24120
+export GNOME_DISABLE_CRASH_DIALOG=SET_BY_GOOGLE_CHROME
+
+# Automagically migrate user data directory.
+# TODO(phajdan.jr): Remove along with migration code in the browser for M33.
+if [[ -n "" ]]; then
+  if [[ ! -d "" ]]; then
+    "$HERE/chrome" "--migrate-data-dir-for-sxs=" \
+      --enable-logging=stderr --log-level=0
+  fi
+fi
+
+# Make sure that the profile directory specified in the environment, if any,
+# overrides the default.
+if [[ -n "$CHROME_USER_DATA_DIR" ]]; then
+  PROFILE_DIRECTORY_FLAG="--user-data-dir=$CHROME_USER_DATA_DIR"
+fi
+
+# Sanitize std{in,out,err} because they'll be shared with untrusted child
+# processes (http://crbug.com/376567).
+exec < /dev/null
+exec > >(exec cat)
+exec 2> >(exec cat >&2)
+
+# Note: exec -a below is a bashism.
+# DOCKER SELENIUM NOTE: Strait copy of script installed by Chrome with the exception of adding
+# the --no-sandbox flag here.
+exec -a "$0" "$HERE/chrome" --no-sandbox "$PROFILE_DIRECTORY_FLAG" \
+  "$@"
+exec -a "$0" /etc/alternatives/google-chrome --no-sandbox "$@"
diff --git a/build/chrome/install.sh b/build/chrome/install.sh
index 08a36e8ad..fdc03edca 100644
--- a/build/chrome/install.sh
+++ b/build/chrome/install.sh
@@ -31,8 +31,13 @@ mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION
 chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION
 ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
 
-#==================
+#========================
 # Selenium Configuration
-#==================
+#========================
 cp /tmp/build/chrome/config.json /opt/selenium/config.json
-#cp -rT /tmp/build/chrome/etc/ /etc/
+
+#=================================
+# Chrome Launch Script Modication
+#=================================
+chmod +x /tmp/build/chrome/chrome_launcher.sh
+cp /tmp/build/chrome/chrome_launcher.sh /opt/google/chrome/google-chrome