diff --git a/config-development.toml b/config-development.toml
index 97e194d..eaca559 100644
--- a/config-development.toml
+++ b/config-development.toml
@@ -42,7 +42,7 @@ destination_branch = "\\1"
 source_url = "https://github.com/mozilla-conduit/ff-test"
 tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
-tags_destination_branch = "dev-tags-bug1963805"
+tags_destination_branch = "tags-dev"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -50,7 +50,7 @@ tags_destination_branch = "dev-tags-bug1963805"
 source_url = "https://github.com/mozilla-conduit/ff-test"
 tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)b\\d+_(BUILD\\d+|RELEASE)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
-tags_destination_branch = "dev-tags-bug1963805"
+tags_destination_branch = "tags-dev"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -58,7 +58,7 @@ tags_destination_branch = "dev-tags-bug1963805"
 source_url = "https://github.com/mozilla-conduit/ff-test"
 tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+)(_\\d+)+esr_(BUILD\\d+|RELEASE)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
-tags_destination_branch = "dev-tags-bug1963805"
+tags_destination_branch = "tags-dev"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -66,7 +66,7 @@ tags_destination_branch = "dev-tags-bug1963805"
 source_url = "https://github.com/mozilla-conduit/ff-test"
 tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)_(BUILD\\d+|RELEASE)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
-tags_destination_branch = "dev-tags-bug1963805"
+tags_destination_branch = "tags-dev"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -74,7 +74,7 @@ tags_destination_branch = "dev-tags-bug1963805"
 source_url = "https://github.com/mozilla-conduit/ff-test"
 tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)b\\d+_(BUILD\\d+|RELEASE)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
-tags_destination_branch = "dev-tags-bug1963805"
+tags_destination_branch = "tags-dev"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -82,7 +82,7 @@ tags_destination_branch = "dev-tags-bug1963805"
 source_url = "https://github.com/mozilla-conduit/ff-test"
 tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_RELEASE_(\\d+)+_(BASE|END)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
-tags_destination_branch = "dev-tags-bug1963805"
+tags_destination_branch = "tags-dev"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -101,6 +101,6 @@ destination_branch = "default"
 source_url = "https://github.com/mozilla-conduit/test-repo"
 tag_pattern = "^(DEV)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/test-repo-github-dev"
-tags_destination_branch = "dev-tags-bug1963805"
+tags_destination_branch = "tags-dev"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
diff --git a/config-production.toml b/config-production.toml
index 2b1b2dd..0c52907 100644
--- a/config-production.toml
+++ b/config-production.toml
@@ -36,7 +36,7 @@ url = "https://github.com/mozilla-firefox/firefox.git"
 source_url = "https://github.com/mozilla-firefox/firefox.git"
 branch_pattern = "THIS_SHOULD_MATCH_NOTHING"
 destination_url = "https://hg.mozilla.org/mozilla-unified/"
-destination_branch = "default"
+destination_branch = "NOT_A_VALID_BRANCH"
 
 
 #
@@ -58,30 +58,30 @@ branch_pattern = "beta"
 destination_url = "ssh://hg.mozilla.org/releases/mozilla-beta/"
 destination_branch = "default"
 
-# [[tag_mappings]]
-# source_url = "https://github.com/mozilla-firefox/firefox.git"
-# # <M>_<m>(_<p>...)b<n> BUILD and RELEASE tags to mozilla-beta
-# tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)b\\d+_(BUILD\\d+|RELEASE)$"
-# destination_url = "ssh://hg.mozilla.org/releases/mozilla-beta/"
-# tags_destination_branch = "tags-beta"
-# # Default
-# #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
-#
-# [[tag_mappings]]
-# source_url = "https://github.com/mozilla-firefox/firefox.git"
-# # BETA_<M> BASE and END tags to mozilla-beta
-# tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_BETA_(\\d+)+_(BASE|END)$"
-# destination_url = "ssh://hg.mozilla.org/releases/mozilla-beta/"
-# tags_destination_branch = "tags-beta"
-# # Default
-# #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
-#
-# [[tag_mappings]]
-# source_url = "https://github.com/mozilla-firefox/firefox.git"
-# # RELEASE_<M> BASE tags to mozilla-beta
-# tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_RELEASE_(\\d+)+_BASE$"
-# destination_url = "ssh://hg.mozilla.org/releases/mozilla-beta/"
-# tags_destination_branch = "tags-beta"
+[[tag_mappings]]
+source_url = "https://github.com/mozilla-firefox/firefox.git"
+# <M>_<m>(_<p>...)b<n> BUILD and RELEASE tags to mozilla-beta
+tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)b\\d+_(BUILD\\d+|RELEASE)$"
+destination_url = "ssh://hg.mozilla.org/releases/mozilla-beta/"
+tags_destination_branch = "tags-beta"
+# Default
+#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
+
+[[tag_mappings]]
+source_url = "https://github.com/mozilla-firefox/firefox.git"
+# BETA_<M> BASE and END tags to mozilla-beta
+tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_BETA_(\\d+)+_(BASE|END)$"
+destination_url = "ssh://hg.mozilla.org/releases/mozilla-beta/"
+tags_destination_branch = "tags-beta"
+# Default
+#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
+
+[[tag_mappings]]
+source_url = "https://github.com/mozilla-firefox/firefox.git"
+# RELEASE_<M> BASE tags to mozilla-beta
+tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_RELEASE_(\\d+)+_BASE$"
+destination_url = "ssh://hg.mozilla.org/releases/mozilla-beta/"
+tags_destination_branch = "tags-beta"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -96,12 +96,12 @@ branch_pattern = "^(esr\\d+)$"
 destination_url = "ssh://hg.mozilla.org/releases/mozilla-\\1/"
 destination_branch = "default"
 
-# [[tag_mappings]]
-# source_url = "https://github.com/mozilla-firefox/firefox.git"
-# # <M>_<m>(_<p>...)esr BUILD and RELEASE tags to mozilla-esr<M>
-# tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+)(_\\d+)+esr_(BUILD\\d+|RELEASE)$"
-# destination_url = "ssh://hg.mozilla.org/releases/mozilla-esr\\2/"
-# tags_destination_branch = "tags-\\1"
+[[tag_mappings]]
+source_url = "https://github.com/mozilla-firefox/firefox.git"
+# <M>_<m>(_<p>...)esr BUILD and RELEASE tags to mozilla-esr<M>
+tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+)(_\\d+)+esr_(BUILD\\d+|RELEASE)$"
+destination_url = "ssh://hg.mozilla.org/releases/mozilla-esr\\2/"
+tags_destination_branch = "tags-esr\\2"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -125,12 +125,12 @@ branch_pattern = "main"
 destination_url = "ssh://hg.mozilla.org/mozilla-central/"
 destination_branch = "default"
 
-# [[tag_mappings]]
-# source_url = "https://github.com/mozilla-firefox/firefox.git"
-# # BETA_<M> and NIGHTLY_<M> tags to m-c
-# tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
-# destination_url = "ssh://hg.mozilla.org/mozilla-central/"
-# tags_destination_branch = "tags-main"
+[[tag_mappings]]
+source_url = "https://github.com/mozilla-firefox/firefox.git"
+# BETA_<M> and NIGHTLY_<M> tags to m-c
+tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
+destination_url = "ssh://hg.mozilla.org/mozilla-central/"
+tags_destination_branch = "tags-main"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -144,21 +144,21 @@ branch_pattern = "release"
 destination_url = "ssh://hg.mozilla.org/releases/mozilla-release/"
 destination_branch = "default"
 
-# [[tag_mappings]]
-# source_url = "https://github.com/mozilla-firefox/firefox.git"
-# # <M>_<m>(_<p>...) BUILD and RELEASE tags to mozilla-release
-# tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)_(BUILD\\d+|RELEASE)$"
-# destination_url = "ssh://hg.mozilla.org/releases/mozilla-release/"
-# tags_destination_branch = "tags-release"
+[[tag_mappings]]
+source_url = "https://github.com/mozilla-firefox/firefox.git"
+# <M>_<m>(_<p>...) BUILD and RELEASE tags to mozilla-release
+tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)_(BUILD\\d+|RELEASE)$"
+destination_url = "ssh://hg.mozilla.org/releases/mozilla-release/"
+tags_destination_branch = "tags-release"
 # # Default
 # #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 #
-# [[tag_mappings]]
-# source_url = "https://github.com/mozilla-firefox/firefox.git"
-# # RELEASE_<M> BASE and END tags to mozilla-release
-# tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_RELEASE_(\\d+)+_(BASE|END)$"
-# destination_url = "ssh://hg.mozilla.org/releases/mozilla-release/"
-# tags_destination_branch = "tags-release"
+[[tag_mappings]]
+source_url = "https://github.com/mozilla-firefox/firefox.git"
+# RELEASE_<M> BASE and END tags to mozilla-release
+tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_RELEASE_(\\d+)+_(BASE|END)$"
+destination_url = "ssh://hg.mozilla.org/releases/mozilla-release/"
+tags_destination_branch = "tags-release"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -194,7 +194,7 @@ url = "https://github.com/mozilla-firefox/infra-testing.git"
 source_url = "https://github.com/mozilla-firefox/infra-testing.git"
 branch_pattern = "THIS_SHOULD_MATCH_NOTHING"
 destination_url = "https://hg.mozilla.org/mozilla-unified/"
-destination_branch = "default"
+destination_branch = "NOT_A_VALID_BRANCH"
 
 [[branch_mappings]]
 source_url = "https://github.com/mozilla-firefox/infra-testing.git"
@@ -202,11 +202,11 @@ branch_pattern = "autoland"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/infra-testing/"
 destination_branch = "default"
 
-# [[tag_mappings]]
-# source_url = "https://github.com/mozilla-firefox/infra-testing.git"
-# tag_pattern = "TAGTESTING.*"
-# destination_url = "ssh://hg.mozilla.org/conduit-testing/infra-testing/"
-# tags_destination_branch = "tags-autoland"
+[[tag_mappings]]
+source_url = "https://github.com/mozilla-firefox/infra-testing.git"
+tag_pattern = ".+"
+destination_url = "ssh://hg.mozilla.org/conduit-testing/infra-testing/"
+tags_destination_branch = "tags-testing"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
 
@@ -225,10 +225,10 @@ branch_pattern = ".+"
 destination_url = "ssh://hg.mozilla.org/conduit-testing/review/"
 destination_branch = "default"
 
-# [[tag_mappings]]
-# source_url = "https://github.com/mozilla-conduit/review.git"
-# tag_pattern = ".+"
-# destination_url = "ssh://hg.mozilla.org/conduit-testing/review/"
-# tags_destination_branch = "tags"
+[[tag_mappings]]
+source_url = "https://github.com/mozilla-conduit/review.git"
+tag_pattern = ".+"
+destination_url = "ssh://hg.mozilla.org/conduit-testing/review/"
+tags_destination_branch = "tags"
 # Default
 #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"