--- a/mozilla/release-fennec-mozilla-beta.py
+++ b/mozilla/release-fennec-mozilla-beta.py
@@ -144,16 +144,17 @@ releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
 releaseConfig['ftpSymlinkName'] = 'latest-beta'
 releaseConfig['enableAutomaticPushToMirrors'] = True
 releaseConfig['localTestChannel']      = 'beta-localtest'
 releaseConfig['cdnTestChannel']        = 'beta-cdntest'
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['testChannelRuleIds']    = []
+releaseConfig['releaseChannelRuleIds'] = []
 # Tuxedo/Bouncer configuration
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-beta-latest',
 }
 releaseConfig['skip_updates']        = True
\ No newline at end of file

--- a/mozilla/release-fennec-mozilla-beta.py.template
+++ b/mozilla/release-fennec-mozilla-beta.py.template
@@ -144,16 +144,17 @@ releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
 releaseConfig['ftpSymlinkName'] = 'latest-beta'
 releaseConfig['enableAutomaticPushToMirrors'] = True
 releaseConfig['localTestChannel']      = 'beta-localtest'
 releaseConfig['cdnTestChannel']        = 'beta-cdntest'
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['testChannelRuleIds']    = []
+releaseConfig['releaseChannelRuleIds'] = []
 # Tuxedo/Bouncer configuration
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-beta-latest',
 }
 releaseConfig['skip_updates']        = True
\ No newline at end of file

--- a/mozilla/release-fennec-mozilla-release.py
+++ b/mozilla/release-fennec-mozilla-release.py
@@ -106,16 +106,17 @@ releaseConfig['partnerRepackConfig'] = {
     },
 }
 
 # mozconfigs
 releaseConfig['mozconfigs']          = {
     'android': 'mobile/android/config/mozconfigs/android/release',
     'android-x86': 'mobile/android/config/mozconfigs/android-x86/release',
 }
+releaseConfig['releaseChannel']      = 'release'
 
 # Misc configuration
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
@@ -147,20 +148,21 @@ releaseConfig['multilocale_config'] = {
     ]
 }
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
 releaseConfig['ftpSymlinkName'] = 'latest'
-releaseConfig['testChannels']          = ['release-localtest', 'release-cdntest']
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
-releaseConfig['testChannelRuleIds']    = []
-
+releaseConfig['localTestChannel']      = 'betatest'
+releaseConfig['cdnTestChannel']        = 'releasetest'
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
+releaseConfig['testChannelRuleIds']    = []
+releaseConfig['releaseChannelRuleIds'] = []
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-latest',
 }
 releaseConfig['skip_updates']        = True
\ No newline at end of file

--- a/mozilla/release-fennec-mozilla-release.py.template
+++ b/mozilla/release-fennec-mozilla-release.py.template
@@ -106,16 +106,17 @@ releaseConfig['partnerRepackConfig'] = {
     },
 }
 
 # mozconfigs
 releaseConfig['mozconfigs']          = {
     'android': 'mobile/android/config/mozconfigs/android/release',
     'android-x86': 'mobile/android/config/mozconfigs/android-x86/release',
 }
+releaseConfig['releaseChannel']        = 'release'
 
 # Misc configuration
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
@@ -147,20 +148,22 @@ releaseConfig['multilocale_config'] = {
     ]
 }
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
 releaseConfig['ftpSymlinkName'] = 'latest'
-releaseConfig['testChannels']          = ['release-localtest', 'release-cdntest']
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
+releaseConfig['localTestChannel']      = 'betatest'
+releaseConfig['cdnTestChannel']        = 'releasetest'
 releaseConfig['testChannelRuleIds']    = []
+releaseConfig['releaseChannelRuleIds'] = []
 
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-latest',
 }
 releaseConfig['skip_updates']        = True

--- a/mozilla/staging_release-fennec-mozilla-beta.py
+++ b/mozilla/staging_release-fennec-mozilla-beta.py
@@ -154,15 +154,16 @@ releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android', 'linux')
 releaseConfig['ftpSymlinkName'] = 'latest-beta'
 releaseConfig['enableAutomaticPushToMirrors'] = True
 releaseConfig['localTestChannel']      = 'beta-localtest'
 releaseConfig['cdnTestChannel']        = 'beta-cdntest'
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['testChannelRuleIds']    = [37]
+releaseConfig['releaseChannelRuleIds'] = []
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-beta-latest',
 }
 releaseConfig['skip_updates']        = True
\ No newline at end of file

--- a/mozilla/staging_release-fennec-mozilla-beta.py.template
+++ b/mozilla/staging_release-fennec-mozilla-beta.py.template
@@ -151,16 +151,17 @@ releaseConfig['autoGenerateChecksums'] =
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android', 'android-x86', 'linux')
 releaseConfig['ftpSymlinkName'] = 'latest-beta'
 releaseConfig['enableAutomaticPushToMirrors'] = True
 releaseConfig['localTestChannel']      = 'betatest'
 releaseConfig['cdnTestChannel']        = 'releasetest'
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
+releaseConfig['releaseChannelRuleIds'] = []
 releaseConfig['testChannelRuleIds']    = [37]
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-beta-latest',
 }
 releaseConfig['skip_updates']        = True
\ No newline at end of file

--- a/mozilla/staging_release-fennec-mozilla-release.py
+++ b/mozilla/staging_release-fennec-mozilla-release.py
@@ -112,16 +112,17 @@ releaseConfig['partnerRepackConfig'] = {
          },
     },
 }
 
 # mozconfigs
 releaseConfig['mozconfigs']          = {
     'android': 'mobile/android/config/mozconfigs/android/release',
 }
+releaseConfig['releaseChannel']        = 'release'
 
 # Misc configuration
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
@@ -161,15 +162,16 @@ releaseConfig['autoGenerateChecksums'] =
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android','linux')
 releaseConfig['ftpSymlinkName'] = 'latest'
 releaseConfig['localTestChannel']      = 'betatest'
 releaseConfig['cdnTestChannel']        = 'releasetest'
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['testChannelRuleIds']    = [38, 39]
+releaseConfig['releaseChannelRuleIds'] = []
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.allizom.org/api'
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-latest',
 }
 releaseConfig['skip_updates']        = True
\ No newline at end of file

--- a/mozilla/staging_release-fennec-mozilla-release.py.template
+++ b/mozilla/staging_release-fennec-mozilla-release.py.template
@@ -108,16 +108,17 @@ releaseConfig['partnerRepackConfig'] = {
          },
     },
 }
 
 # mozconfigs
 releaseConfig['mozconfigs']          = {
     'android': 'mobile/android/config/mozconfigs/android/release',
 }
+releaseConfig['releaseChannel']        = 'release'
 
 # Misc configuration
 releaseConfig['enable_repo_setup']       = False
 
 # Fennec specific
 releaseConfig['usePrettyNames']           = False
 releaseConfig['disableStandaloneRepacks'] = True
 releaseConfig['disablePermissionCheck']   = True
@@ -151,18 +152,21 @@ releaseConfig['multilocale_config'] = {
 
 # Staging config
 releaseConfig['build_tools_repo_path'] = "users/stage-ffxbld/tools"
 releaseConfig['enableSigningAtBuildTime'] = True
 releaseConfig['enablePartialMarsAtBuildTime'] = False
 releaseConfig['autoGenerateChecksums'] = False
 releaseConfig['use_mock'] = True
 releaseConfig['mock_platforms'] = ('android','linux')
-releaseConfig['ftpSymlinkName'] = 'latest'releaseConfig['testChannels']          = ['release-localtest', 'release-cdntest']
+releaseConfig['ftpSymlinkName'] = 'latest'
+releaseConfig['localTestChannel']      = 'betatest'
+releaseConfig['cdnTestChannel']        = 'releasetest'
 releaseConfig['partialUpdates']      = {}
 releaseConfig['bouncerServer']       = 'download.mozilla.org'
+releaseConfig['releaseChannelRuleIds'] = []
 releaseConfig['testChannelRuleIds']    = [38, 39]
 releaseConfig['tuxedoServerUrl']     = 'https://bounceradmin.mozilla.com/api'
 releaseConfig['bouncer_submitter_config'] = 'releases/bouncer_fennec.py'
 releaseConfig['bouncer_aliases'] = {
     'Fennec-%(version)s': 'fennec-latest',
 }
 releaseConfig['skip_updates']        = True
\ No newline at end of file