diff --git a/taskcluster/ci/browsertime/kind.yml b/taskcluster/ci/browsertime/kind.yml
index 29a04af0b..a9db4116e 100644
--- a/taskcluster/ci/browsertime/kind.yml
+++ b/taskcluster/ci/browsertime/kind.yml
@@ -13,7 +13,7 @@ kind-dependencies:
 primary-dependency: signing
 
 only-for-build-types:
-    - nightly
+    - nightly-simulation
 
 only-for-abis:
     - armeabi-v7a
diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
index b50a88b94..5f7a6fab5 100644
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -104,6 +104,18 @@ jobs:
         treeherder:
             symbol: nightly(B)
 
+    nightly-simulation:
+        attributes:
+            nightly: false
+        run-on-tasks-for: [github-push]
+        include-nightly-version: true
+        include-shippable-secrets: true
+        run:
+            geckoview-engine: geckoNightly
+            gradle-build-type: fennecNightly
+        treeherder:
+            symbol: nightlySim(B)
+
     beta:
         attributes:
             release-type: beta
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index f8072cdf9..ee2db8db0 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -11,6 +11,7 @@ treeherder:
         'forPerformanceTest': 'Builds made for Raptor and other performance tests'
         'I': 'Docker Image Builds'
         'nightly': 'Nightly-related tasks'
+        'nightlySim': 'Nightly-related tasks that run on each github push'
         'nightlyFennec': 'Nightly-related tasks with same APK configuration as Fennec'
         'production': 'Release-related tasks'
         'productionFennec': 'Production-related tasks with same APK configuration as Fennec'
diff --git a/taskcluster/ci/signing/kind.yml b/taskcluster/ci/signing/kind.yml
index 17f207df9..b762af952 100644
--- a/taskcluster/ci/signing/kind.yml
+++ b/taskcluster/ci/signing/kind.yml
@@ -20,7 +20,7 @@ job-template:
     description: Sign Fenix
     worker-type:
         by-build-type:
-            (fennec-.+|nightly|beta|production|android-test-nightly):
+            (fennec-.+|nightly|beta|production|android-test-nightly|nightly-simulation):
                 by-level:
                     '3': signing
                     default: dep-signing
@@ -36,6 +36,10 @@ job-template:
                     by-level:
                         '3': fennec-nightly-signing
                         default: dep-signing
+                nightly-simulation:
+                    by-level:
+                        '3': fennec-nightly-signing
+                        default: dep-signing
                 nightly:
                     by-level:
                         '3': nightly-signing
@@ -62,7 +66,7 @@ job-template:
           default: autograph_apk
     index:
         by-build-type:
-            (fennec-.+|nightly|performance-test|beta|production|debug):
+            (fennec-.+|nightly|performance-test|beta|production|debug|nightly-simulation):
                 type: signing
             default: {}
     run-on-tasks-for: []