diff --git a/Jenkinsfile b/Jenkinsfile
index 27424ea19..a969e6d20 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,7 +52,7 @@ SUPPORTED_STAGES = [
 ]
 
 // Supported VM Images
-SLAVE_IMAGE = 'gcr.io/endpoints-jenkins/debian-9:0.10'
+SLAVE_IMAGE = 'gcr.io/endpoints-jenkins/debian-9:0.11'
 
 // Release Qualification end to end tests.
 // If RAPTURE_REPO build parameter is set only those test will run.
@@ -221,7 +221,6 @@ def presubmit() {
       'release': {
         BuildNode {
           presubmitTests('release')
-          presubmitTests('docker-tests', false)
         }
       },
       'tsan': {
diff --git a/jenkins/slaves/Makefile b/jenkins/slaves/Makefile
index 3b79fd868..fad56ab04 100644
--- a/jenkins/slaves/Makefile
+++ b/jenkins/slaves/Makefile
@@ -1,5 +1,5 @@
 PROJECT = endpoints-jenkins
-VERSION = 0.10
+VERSION = 0.11
 TOOLS_BUCKET = endpoints-tools
 
 # Note: The build directory is the root of the istio/test-infra repository, not ./
diff --git a/script/linux-install-software b/script/linux-install-software
index ce245d6e9..1acb0f594 100755
--- a/script/linux-install-software
+++ b/script/linux-install-software
@@ -101,7 +101,7 @@ ${SUDO} apt-get clean
 retry install_packages || error_exit 'Cannot install required packages.'
 retry ${SUDO} pip install --upgrade python-gflags || error_exit 'Cannot install gflags.'
 retry ${SUDO} pip install --upgrade certifi || error_exit 'Cannot install certifi.'
-retry ${SUDO} pip install --upgrade oauth2client || error_exit 'Cannot install oauth2client.'
+retry ${SUDO} pip install --upgrade google-auth google-auth-httplib2 google-api-python-client || error_exit 'Cannot install google-auth.'
 retry ${SUDO} pip install --upgrade urllib3 || error_exit 'Cannot install urllib3.'
 retry ${SUDO} pip install --upgrade prettytable Mako pyaml dateutils || error_exit 'Cannot install prettytable Mako pyaml dateutils.'
 
diff --git a/start_esp/BUILD b/start_esp/BUILD
index 082e34f65..7cda56e49 100644
--- a/start_esp/BUILD
+++ b/start_esp/BUILD
@@ -53,7 +53,7 @@ pex_binary(
     reqs = [
         "certifi",
         "mako>=1.0.4",
-        "oauth2client>=3.0.0",
+        "google-auth>=1.6.3",
         "pyasn1>=0.1.9",
         "pyasn1-modules>=0.0.8",
         "urllib3>=1.16",
diff --git a/start_esp/fetch_service_config.py b/start_esp/fetch_service_config.py
index 97c8f8f3e..0ae6a2fe0 100755
--- a/start_esp/fetch_service_config.py
+++ b/start_esp/fetch_service_config.py
@@ -29,7 +29,7 @@
 import json
 import logging
 import urllib3
-from oauth2client.service_account import ServiceAccountCredentials
+from google.oauth2.service_account import Credentials
 
 # Service management service
 SERVICE_MGMT_ROLLOUTS_URL_TEMPLATE = (
@@ -144,7 +144,7 @@ def fetch_metadata_attributes(metadata):
 def make_access_token(secret_token_json):
     """Construct an access token from service account token."""
     logging.info("Constructing an access token with scope " + _GOOGLE_API_SCOPE)
-    credentials = ServiceAccountCredentials.from_json_keyfile_name(
+    credentials = Credentials.from_service_account_info(
         secret_token_json,
         scopes=[_GOOGLE_API_SCOPE])
     logging.info("Service account email: " + credentials.service_account_email)