diff --git a/factory_upload_tool/ce/wv_upload_tool.py b/factory_upload_tool/ce/wv_upload_tool.py
index 021e8a8e..90b24786 100644
--- a/factory_upload_tool/ce/wv_upload_tool.py
+++ b/factory_upload_tool/ce/wv_upload_tool.py
@@ -21,7 +21,7 @@ import urllib.request
 import uuid
 import webbrowser
 
-DEFAULT_BASE = 'https://widevine.googleapis.com/v1/orgs/'
+DEFAULT_BASE = 'https://widevine.googleapis.com/v1beta1'
 UPLOAD_PATH = '/uniqueDeviceInfo:batchUpload'
 TOKEN_CACHE_FILE = os.path.join(
     os.path.expanduser('~'), '.device_info_uploader.token')
@@ -315,8 +315,8 @@ def upload_batch(args, device_metadata, bccs):
   print("Uploading {} bcc(s) for build '{}'".format(len(bccs), device_metadata))
   body = format_request_body(args, device_metadata, bccs)
   print(body)
-  print(args.endpoint + args.org_name + UPLOAD_PATH)
-  request = urllib.request.Request(args.endpoint + args.org_name + UPLOAD_PATH)
+  print(args.endpoint + UPLOAD_PATH)
+  request = urllib.request.Request(args.endpoint + UPLOAD_PATH)
   request.add_header('Content-Type', 'application/json')
   request.add_header('X-GFE-SSL', 'yes')
   request.add_header('Authorization',