diff --git a/bitrise.yml b/bitrise.yml
index 2557feb68af2..3042215d819e 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -33,6 +33,7 @@ stages:
         run_if: '{{getenv "BUILD_FOCUS_IOS" | eq "true"}}'
     - klar_unit_test:
         run_if: '{{getenv "BUILD_FOCUS_IOS" | eq "true"}}'
+
 workflows:
   firefox_configure_build:
     before_run:
diff --git a/taskcluster/config.yml b/taskcluster/config.yml
index 73a48ad8ebc4..e6a496bacf11 100644
--- a/taskcluster/config.yml
+++ b/taskcluster/config.yml
@@ -21,7 +21,7 @@ workers:
             provisioner: scriptworker-k8s
             implementation: scriptworker-bitrise
             os: scriptworker
-            worker-type: mobile-{level}-bitrise
+            worker-type: mobile-{level}-bitrise-dev
         images:
             provisioner: 'mobile-{level}'
             implementation: docker-worker
diff --git a/taskcluster/ffios_taskgraph/transforms/bitrise.py b/taskcluster/ffios_taskgraph/transforms/bitrise.py
index 68e3f2591cb6..fecc19eb369a 100644
--- a/taskcluster/ffios_taskgraph/transforms/bitrise.py
+++ b/taskcluster/ffios_taskgraph/transforms/bitrise.py
@@ -54,4 +54,5 @@ def add_worker(config, tasks):
     for task in tasks:
         worker = task.setdefault("worker", {})
         worker["bitrise"] = task.pop("bitrise")
+        task.setdefault("run-on-tasks-for", ["github-push"])
         yield task
diff --git a/taskcluster/kinds/build/kind.yml b/taskcluster/kinds/build/kind.yml
index b5fd335ae05b..fb89b8182936 100644
--- a/taskcluster/kinds/build/kind.yml
+++ b/taskcluster/kinds/build/kind.yml
@@ -8,8 +8,22 @@ transforms:
     - ffios_taskgraph.transforms.bitrise
     - taskgraph.transforms.task
 
-
+task-defaults:
+    worker-type: bitrise
+    bitrise:
+        artifact_prefix: public
 tasks:
+    build-firefox-debug:
+        description: Build firefox_configure_build bitrise workflow
+        run-on-tasks-for: 
+            - github-pull-request
+            - github-push
+        bitrise:
+            workflows:
+                - firefox_configure_build
+        optimization:
+            skip-unless-changed:
+                - bitrise.yml
     screenshots:
         description: Generate build instrumented for screenshots, including en-US pictures
         attributes:
@@ -22,7 +36,6 @@ tasks:
             platform: ios/opt
         worker-type: bitrise
         bitrise:
-            artifact_prefix: public
             workflows:
                 - L10nBuild
         index: