diff --git a/lib/paygen/paygen_build_lib.py b/lib/paygen/paygen_build_lib.py
index a248bd9..6d768e5 100644
--- a/lib/paygen/paygen_build_lib.py
+++ b/lib/paygen/paygen_build_lib.py
@@ -610,13 +610,17 @@
     """
     results = []
 
+    # Paygen channel names typically end in '-channel', while Goldeneye
+    # does not maintain the '-channel' ending.
+    channel_name = self._build.channel.replace('-channel', '')
+
     contents = json.loads(gslib.Cat(OMAHA_URI))
     for nmo in contents.get('omaha_data', []):
       nmo_board = nmo['board']['public_codename']
       nmo_channel = nmo['channel']
       nmo_version = nmo['chrome_os_version']
 
-      if nmo_board == self._build.board and nmo_channel == self._build.channel:
+      if nmo_board == self._build.board and nmo_channel == channel_name:
         results.append(gspaths.Build(gspaths.Build(version=nmo_version,
                                                    board=self._build.board,
                                                    channel=self._build.channel,
diff --git a/lib/paygen/paygen_build_lib_unittest.py b/lib/paygen/paygen_build_lib_unittest.py
index 106e48a..6498629 100644
--- a/lib/paygen/paygen_build_lib_unittest.py
+++ b/lib/paygen/paygen_build_lib_unittest.py
@@ -400,7 +400,7 @@
            u'keyset': u'foo-mp',
            u'board':
            {u'public_codename': u'foo-board', u'is_active': True},
-           u'chrome_os_version': u'7478.0.0', u'channel': u'foo-channel',
+           u'chrome_os_version': u'7478.0.0', u'channel': u'foo',
            u'payloads':
            [{u'max_fraction': False,
              u'name': u'foo-channel/foo/7478.0.0/payloads/'
@@ -421,7 +421,7 @@
            u'keyset': u'notfoo-mp',
            u'board':
            {u'public_codename': u'notfoo-board', u'is_active': True},
-           u'chrome_os_version': u'7478.0.0', u'channel': u'notfoo-channel',
+           u'chrome_os_version': u'7478.0.0', u'channel': u'notfoo',
            u'payloads':
            [{u'max_fraction': False,
              u'name': u'notfoo-channel/notfoo/7478.0.0/payloads/'