diff --git a/taskcluster/ci/bouncer-locations/kind.yml b/taskcluster/ci/bouncer-locations/kind.yml
index ec250e462c73..d334910f8ae3 100644
--- a/taskcluster/ci/bouncer-locations/kind.yml
+++ b/taskcluster/ci/bouncer-locations/kind.yml
@@ -40,5 +40,7 @@ jobs:
          - firefox-nightly-latest-ssl
          - firefox-nightly-latest-l10n
          - firefox-nightly-latest-l10n-ssl
+         - firefox-nightly-msi-latest-ssl
+         - firefox-nightly-msi-latest-l10n-ssl
       treeherder:
          platform: firefox-release/opt
diff --git a/taskcluster/ci/release-bouncer-aliases/kind.yml b/taskcluster/ci/release-bouncer-aliases/kind.yml
index 76435d7ec30a..41f2a05c8a39 100644
--- a/taskcluster/ci/release-bouncer-aliases/kind.yml
+++ b/taskcluster/ci/release-bouncer-aliases/kind.yml
@@ -41,6 +41,7 @@ jobs:
          firefox-devedition-latest-ssl: installer-ssl
          firefox-devedition-latest: installer
          firefox-devedition-stub: stub-installer
+         firefox-devedition-msi-latest-ssl: msi
       shipping-product: devedition
       treeherder:
          platform: devedition-release/opt
@@ -68,13 +69,16 @@ jobs:
                firefox-beta-latest-ssl: installer-ssl
                firefox-beta-latest: installer
                firefox-beta-stub: stub-installer
+               firefox-beta-msi-latest-ssl: msi
             mozilla-release:
                firefox-latest-ssl: installer-ssl
                firefox-latest: installer
                firefox-stub: stub-installer
+               firefox-msi-latest-ssl: msi
             mozilla-esr60:
                firefox-esr-latest-ssl: installer-ssl
                firefox-esr-latest: installer
+               firefox-esr-msi-latest-ssl: msi
             birch:
                firefox-latest-ssl: installer-ssl
                firefox-latest: installer
diff --git a/taskcluster/ci/release-bouncer-sub/kind.yml b/taskcluster/ci/release-bouncer-sub/kind.yml
index 831451a88c67..3ce86f0f688a 100644
--- a/taskcluster/ci/release-bouncer-sub/kind.yml
+++ b/taskcluster/ci/release-bouncer-sub/kind.yml
@@ -36,7 +36,7 @@ job-defaults:
 jobs:
    devedition:
       bouncer-platforms: ['linux', 'linux64', 'osx', 'win', 'win64']
-      bouncer-products: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'stub-installer']
+      bouncer-products: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'stub-installer', 'msi']
       shipping-product: devedition
       treeherder:
          platform: devedition-release/opt
@@ -53,7 +53,7 @@ jobs:
       bouncer-platforms: ['linux', 'linux64', 'osx', 'win', 'win64']
       bouncer-products:
          by-project:
-            default: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'stub-installer']
+            default: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'stub-installer', 'msi']
             # No stub installer in esr60
             mozilla-esr60: ['complete-mar', 'complete-mar-bz2', 'installer', 'installer-ssl', 'partial-mar']
             jamun: ['complete-mar', 'complete-mar-bz2', 'installer', 'installer-ssl', 'partial-mar']
diff --git a/taskcluster/taskgraph/transforms/bouncer_submission.py b/taskcluster/taskgraph/transforms/bouncer_submission.py
index 4b2d9c3811e2..b094215815e8 100644
--- a/taskcluster/taskgraph/transforms/bouncer_submission.py
+++ b/taskcluster/taskgraph/transforms/bouncer_submission.py
@@ -98,6 +98,14 @@ CONFIG_PER_BOUNCER_PRODUCT = {
             'win64': '{pretty_product}%20Installer.exe',
         },
     },
+    'msi': {
+        'name_postfix': '-msi-SSL',
+        'path_template': RELEASES_PATH_TEMPLATE,
+        'file_names': {
+            'win': '{pretty_product}%20Installer.msi',
+            'win64': '{pretty_product}%20Installer.msi',
+        }
+    }
 }
 CONFIG_PER_BOUNCER_PRODUCT['installer-ssl'] = copy.deepcopy(
     CONFIG_PER_BOUNCER_PRODUCT['installer'])