diff --git a/cbuildbot/constants.py b/cbuildbot/constants.py
index ef2de5d..8f3c35f 100644
--- a/cbuildbot/constants.py
+++ b/cbuildbot/constants.py
@@ -262,8 +262,8 @@
 ANDROID_BUCKET_URL = 'gs://android-build-chromeos/builds'
 ANDROID_BUILD_BRANCH = 'git_mnc-dr-arc-dev'
 ANDROID_BUILD_TARGETS = {
-    'ARM': ('linux-cheets_arm-userdebug', r'\.zip$'),
-    'X86': ('linux-cheets_x86-userdebug', r'\.zip$'),
+    'ARM': ('linux-cheets_arm-user', r'\.zip$'),
+    'X86': ('linux-cheets_x86-user', r'\.zip$'),
     # TODO(hidehiko): Decprecate this when we switch to public CTS bundle.
     'CTS': ('linux-cts', r'/android-cts\.zip$'),
     'SDK_TOOLS': ('linux-static_sdk_tools', r'/(aapt|adb)$'),
diff --git a/scripts/cros_mark_android_as_stable_unittest.py b/scripts/cros_mark_android_as_stable_unittest.py
index c0b1f34..de32c64 100644
--- a/scripts/cros_mark_android_as_stable_unittest.py
+++ b/scripts/cros_mark_android_as_stable_unittest.py
@@ -118,8 +118,8 @@
       for key in constants.ANDROID_BUILD_TARGETS.iterkeys():
         self.setupMockBuild(key, version)
     self.new_subpaths = {
-        'ARM': 'linux-cheets_arm-userdebug100',
-        'X86': 'linux-cheets_x86-userdebug100',
+        'ARM': 'linux-cheets_arm-user100',
+        'X86': 'linux-cheets_x86-user100',
         'CTS': 'linux-cts100',
         'SDK_TOOLS': 'linux-static_sdk_tools100',
     }
@@ -206,8 +206,8 @@
                                                           self.old_version)
     self.assertTrue(subpaths)
     self.assertEquals(len(subpaths), 4)
-    self.assertEquals(subpaths['ARM'], 'linux-cheets_arm-userdebug25')
-    self.assertEquals(subpaths['X86'], 'linux-cheets_x86-userdebug25')
+    self.assertEquals(subpaths['ARM'], 'linux-cheets_arm-user25')
+    self.assertEquals(subpaths['X86'], 'linux-cheets_x86-user25')
     self.assertEquals(subpaths['CTS'], 'linux-cts25')
     self.assertEquals(subpaths['SDK_TOOLS'], 'linux-static_sdk_tools25')
 
@@ -243,8 +243,8 @@
     self.assertEqual(version, self.new_version)
     self.assertTrue(subpaths)
     self.assertEquals(len(subpaths), 4)
-    self.assertEquals(subpaths['ARM'], 'linux-cheets_arm-userdebug100')
-    self.assertEquals(subpaths['X86'], 'linux-cheets_x86-userdebug100')
+    self.assertEquals(subpaths['ARM'], 'linux-cheets_arm-user100')
+    self.assertEquals(subpaths['X86'], 'linux-cheets_x86-user100')
     self.assertEquals(subpaths['CTS'], 'linux-cts100')
     self.assertEquals(subpaths['SDK_TOOLS'], 'linux-static_sdk_tools100')