diff --git a/app/build.gradle b/app/build.gradle
index 6418535f6..3ac53b31e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -167,7 +167,7 @@ android {
             setIgnore true
         }
 
-        if (buildType.name == 'fenixProduction' && flavors.contains("geckonightly")) {
+        if (buildType.name == 'fenixProduction' && flavors.contains("geckobeta")) {
             setIgnore true
         }
 
diff --git a/app/src/fenixProduction/AndroidManifest.xml b/app/src/fenixProduction/AndroidManifest.xml
new file mode 100644
index 000000000..5fdb32de4
--- /dev/null
+++ b/app/src/fenixProduction/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        package="org.mozilla.fenix">
+
+    <application>
+
+        <service android:name=".customtabs.CustomTabsService">
+            <!-- Trusted Web Activities are currently only supported in nightly. -->
+            <intent-filter tools:node="removeAll" />
+            <intent-filter>
+                <action android:name="android.support.customtabs.action.CustomTabsService" />
+                <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
+            </intent-filter>
+        </service>
+
+    </application>
+
+</manifest>
diff --git a/app/src/fenixProduction/res/drawable/ic_launcher_foreground.xml b/app/src/fenixProduction/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 000000000..1e3b546ce
--- /dev/null
+++ b/app/src/fenixProduction/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M78.12,44.4c-1.23,-2.69 -3.79,-6.09 -5.71,-6.77 -0.56,-0.2 -1.17,0.48 -1.05,1.06 -2.75,-3.43 -5.87,-6.37 -8.1,-10.31 -0.2,-0.38 -0.41,-1.11 -0.56,-1.32 -0.3,-0.43 -0.91,-0.53 -1.7,-0.06 -4.26,2.54 -8.36,9 -8.6,13.57 -0.5,0.16 -3.27,0.38 -2.87,1.83 0.63,1.3 1.74,0.1 3.19,0 4.36,-0.32 6.95,0.74 9.42,3.1 -1.62,-0.27 -4.04,-0.56 -4.04,0.87 0,0.57 1.28,1.1 1.8,1.51a9.08,9.08 0,0 1,3.45 9.3c-1.18,5.67 -5.69,7.9 -9.94,7.65 -8.76,-0.52 -9.73,-8.35 -9.73,-8.35 1.35,-2.94 5.64,-3.53 6.6,-3.49 1.4,0.05 1.86,-0.24 2.84,-1.09 1.87,-1.63 2.44,-2.85 1.2,-3.5 -1.03,-0.54 -2.9,-1.37 -4.35,-2.35 -2.89,-1.94 -2.34,-2.46 -3.57,-3.11 -0.3,-1.57 -0.41,-2.23 -0.21,-3.92 0.12,-1.1 0.54,-1.78 0.08,-2.14 -0.63,-0.5 -0.75,-0.27 -1.24,-0.1 -2.35,0.81 -4.36,3.01 -5.16,3.73a17.13,17.13 0,0 1,-0.33 -3.98c0.2,-1.28 -0.55,-1.9 -1.8,-1.14 -2.83,1.7 -10.17,8.6 -9.68,19.56 0.59,13.37 10.16,24.88 25.03,25.62 14.87,0.73 25.6,-11.4 26.82,-22.97 0.44,-4.25 -0.22,-9.77 -1.8,-13.2zM59.29,41.5c-1.64,-0.52 -3.26,-1 -5,-0.94 0.17,-2.9 2.58,-7.63 4.43,-9.22 -0.67,2.02 -1.33,6.91 0.57,10.16zM59.78,36.05c0,-3.6 0.76,-4.93 1.5,-6.74a29.71,29.71 0,0 0,2.54 3.6c3.68,4.36 7.84,7.85 10,13.28 0.94,2.34 -0.13,8.45 -3.94,12.16 0.47,-2.87 -0.37,-6.66 -1.33,-7.94 -0.82,-1.08 -1.54,-2.3 -2.6,-3.07 -2.23,-3.48 -2.43,-2.6 -3.94,-4.76a11.17,11.17 0,0 1,-2.23 -6.53zM61.38,64.05c5.04,-3.94 5.41,-12.11 0.7,-16.64 7.82,2.59 6.19,12.1 5.2,13.28 -1.1,1.33 -3.75,2.45 -5.9,3.37zM51.6,50.49c0,1.16 -1.76,0.34 -4.94,1.19 -3.14,0.83 -4.29,3.33 -4.29,3.33 -0.05,-0.79 0.2,-2.4 -0.25,-2.82 -0.37,-0.35 -0.94,-0.18 -1.73,-0.34a5.43,5.43 0,0 1,-3.62 -2.37c2.84,-1.47 5.7,-0.86 8.54,0.47 1.82,0.85 4.27,0.41 6.3,0.54zM44.33,39.18s-0.21,1.32 -0.02,2.76c0,0 -1.62,-0.58 -2.67,-0.57 0.9,-0.97 2.69,-2.2 2.69,-2.2zM30.06,54.53c-0.84,-5.4 2.49,-13 7.63,-16.98 0.12,1.81 0.15,4.26 1.28,5.32 0.3,0.28 1.13,0.1 1.86,0.14 1.37,0.08 3.04,0.43 4.21,1.24 1.7,1.17 2.2,2.76 6.44,4.64 0,0 -4.06,0.11 -5.17,-0.25 -2,-0.65 -3.33,-1.78 -7.28,-1.52 -1.72,0.11 -4.78,1.4 -4.54,2.28 0.7,2.6 3.64,4.31 5.87,4.5 -0.71,6.87 7.33,13.37 14.55,13.17 13.09,-0.38 18.75,-9.5 20.22,-14.27 0.24,4.83 -1.15,10.06 -4.01,13.63 -5.26,6.54 -13.16,8.82 -21.82,7.32 -9.65,-1.68 -17.78,-9.9 -19.23,-19.22zM78.06,57.29C76.55,69.45 65.25,79.3 51.55,78.04c-8.6,-0.79 -16.35,-6.89 -19.22,-13.36 5.41,7.23 11.98,10.77 20.53,11.15 11.55,0.52 20.79,-6.02 23.56,-16.87 1.52,-5.95 -0.15,-11.3 -1.62,-16.7a22.66,22.66 0,0 1,3.27 15.03z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startY="25.09"
+                android:startX="78.92"
+                android:endY="74.45"
+                android:endX="37.26"
+                android:type="linear">
+                <item android:offset="0" android:color="#88FFD1"/>
+                <item android:offset="0.04" android:color="#7BFCD6"/>
+                <item android:offset="0.13" android:color="#57F3E2"/>
+                <item android:offset="0.24" android:color="#1EE5F5"/>
+                <item android:offset="0.29" android:color="#00DDFF"/>
+                <item android:offset="1" android:color="#9059FF"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/app/src/fenixProduction/res/ic_launcher-web.png b/app/src/fenixProduction/res/ic_launcher-web.png
new file mode 100644
index 000000000..872099fde
Binary files /dev/null and b/app/src/fenixProduction/res/ic_launcher-web.png differ
diff --git a/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher.png b/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..5b017a545
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher_round.png b/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..66cb587b5
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher.png b/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..079117be9
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher_round.png b/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..02755d9d1
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher.png b/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..3a1117b60
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..814740c15
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher.png b/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..6be395ba3
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..44ffba047
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..a6c5e03b5
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..653dea8f0
Binary files /dev/null and b/app/src/fenixProduction/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/fenixProduction/res/values/colors.xml b/app/src/fenixProduction/res/values/colors.xml
new file mode 100644
index 000000000..55f8481dc
--- /dev/null
+++ b/app/src/fenixProduction/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<resources>
+    <color name="ic_launcher_background">@color/nightly_launcher_background</color>
+</resources>
diff --git a/app/src/fenixProduction/res/values/static_strings.xml b/app/src/fenixProduction/res/values/static_strings.xml
new file mode 100644
index 000000000..9e477567e
--- /dev/null
+++ b/app/src/fenixProduction/res/values/static_strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<resources>
+    <!-- Name of the application -->
+    <string name="app_name" translatable="false">Firefox Nightly</string>
+</resources>
diff --git a/app/src/fenixProduction/res/xml/shortcuts.xml b/app/src/fenixProduction/res/xml/shortcuts.xml
new file mode 100644
index 000000000..e250a8904
--- /dev/null
+++ b/app/src/fenixProduction/res/xml/shortcuts.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <shortcut
+        android:shortcutId="open_new_tab"
+        android:enabled="true"
+        android:icon="@drawable/ic_static_shortcut_tab"
+        android:shortcutShortLabel="@string/home_screen_shortcut_open_new_tab_2"
+        android:shortcutLongLabel="@string/home_screen_shortcut_open_new_tab_2">
+        <intent
+            android:action="org.mozilla.fenix.OPEN_TAB"
+            android:targetPackage="org.mozilla.fenix"
+            android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
+    </shortcut>
+    <shortcut
+        android:shortcutId="open_new_private_tab"
+        android:enabled="true"
+        android:icon="@drawable/ic_static_shortcut_private_tab"
+        android:shortcutShortLabel="@string/home_screen_shortcut_open_new_private_tab_2"
+        android:shortcutLongLabel="@string/home_screen_shortcut_open_new_private_tab_2">
+        <intent
+            android:action="org.mozilla.fenix.OPEN_PRIVATE_TAB"
+            android:targetPackage="org.mozilla.fenix"
+            android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
+    </shortcut>
+</shortcuts>
diff --git a/app/src/main/java/org/mozilla/fenix/Config.kt b/app/src/main/java/org/mozilla/fenix/Config.kt
index db3d19d5e..bc7f819d1 100644
--- a/app/src/main/java/org/mozilla/fenix/Config.kt
+++ b/app/src/main/java/org/mozilla/fenix/Config.kt
@@ -52,6 +52,7 @@ enum class ReleaseChannel {
             FenixNightly -> true
             FennecNightly -> true
             FenixDebug -> true
+            FenixProduction -> true
             else -> false
         }
 
diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
index 5f7a6fab5..9314d59b7 100644
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -129,14 +129,15 @@ jobs:
         treeherder:
             symbol: beta(B)
 
+    # XXX `production` is now the new nightly. We keep this name around while we officially remove
+    # `nightly` and `fennec-nightly`
     production:
         attributes:
-            release-type: production
-        include-release-version: true
+            nightly: true
+        include-nightly-version: true
         include-shippable-secrets: true
-        filter-incomplete-translations: true
         run:
-            geckoview-engine: geckoBeta
+            geckoview-engine: geckoNightly
             gradle-build-type: fenixProduction
         run-on-tasks-for: [github-release]
         treeherder:
diff --git a/taskcluster/ci/mark-as-shipped/kind.yml b/taskcluster/ci/mark-as-shipped/kind.yml
index 86226ddd5..af8d210f4 100644
--- a/taskcluster/ci/mark-as-shipped/kind.yml
+++ b/taskcluster/ci/mark-as-shipped/kind.yml
@@ -17,8 +17,8 @@ primary-dependency: push-apk
 group-by: build-type
 
 only-for-build-types:
-    - beta
-    - production
+    - fenix-beta
+    - fenix-production
 
 job-template:
     description: Mark Fenix as shipped in ship-it