--- a/README.txt
+++ b/README.txt
@@ -21,8 +21,9 @@ are accessible on Google Groups, or news
 You can download nightly development builds from the Mozilla FTP server.
 Keep in mind that nightly builds, which are used by Mozilla developers for
 testing, may be buggy. Firefox nightlies, for example, can be found at:
 
     ftp://ftp.mozilla.org/pub/firefox/nightly/latest-trunk/
             - or -
     http://nightly.mozilla.org/
 
+

--- a/testing/taskcluster/tasks/build.yml
+++ b/testing/taskcluster/tasks/build.yml
@@ -3,17 +3,20 @@
 ---
 taskId: {{build_slugid}}
 
 task:
   created: '{{now}}'
   deadline: '{{#from_now}}24 hours{{/from_now}}'
   metadata:
     source: http://todo.com/soon
-    owner: {{owner}}
+    owner: mozilla-taskcluster-maintenance@mozilla.com
+
+  tags:
+    createdForUser: {{owner}}
 
   workerType: b2gbuild
   provisionerId: aws-provisioner
   schedulerId: task-graph-scheduler
 
   scopes:
     # Nearly all of our build tasks use tc-vcs so just include the scope across
     # the board.

--- a/testing/taskcluster/tasks/decision/branch.yml
+++ b/testing/taskcluster/tasks/decision/branch.yml
@@ -1,35 +1,38 @@
 ---
 metadata:
   name: 'Task graph used to build {{project}} specific jobs'
   description: |
     {{project}} push for {{owner}} with comment: {{comment}}.
-  owner: "{{owner}}"
+  owner: mozilla-taskcluster-maintenance@mozilla.com
   source: "{{{source}}}"
 
 scopes:
   # Note the below scopes are insecure however these get overriden on the server
   # side to whatever scopes are set by mozilla-taskcluster.
   - queue:*
   - docker-worker:*
   - scheduler:*
 tasks:
   - taskId: '{{#as_slugid}}decision task{{/as_slugid}}'
     task:
       created: '{{now}}'
       deadline: '{{#from_now}}1 day{{/from_now}}'
       metadata:
+        owner: mozilla-taskcluster-maintenance@mozilla.com
         source: {{source}}
-        owner: {{owner}}
         name: Initial decision task for {{project}} specific graphs
         description: |
           This is the single most important task as it decides how all other tasks
           get built.
 
+      tags:
+        createdForUser: {{owner}}
+
       workerType: "gecko-decision"
       provisionerId: "aws-provisioner"
 
       scopes:
         - "docker-worker:cache:tc-vcs-public-sources"
         - "docker-worker:image:quay.io/mozilla/builder:0.3.0"
 
       payload:

--- a/testing/taskcluster/tasks/decision/try.yml
+++ b/testing/taskcluster/tasks/decision/try.yml
@@ -1,52 +1,42 @@
 ---
 metadata:
   name: 'Taskcluster decision task for {{project}}'
   description: |
     Try push for {{owner}} with {{comment}}.
-  owner: "{{owner}}"
+  owner: mozilla-taskcluster-maintenance@mozilla.com
   source: "{{{source}}}"
 
 scopes:
-  - "queue:define-task:aws-provisioner/gecko-decision"
-  - "queue:create-task:aws-provisioner/gecko-decision"
-  - "docker-worker:cache:*"
-  - "docker-worker:image:quay.io/mozilla/decision:0.0.3"
-  - "queue:route:tc-treeherder-stage.{{project}}.{{revision_hash}}"
-  - "queue:route:tc-treeherder.{{project}}.{{revision_hash}}"
-  - 'queue:define-task:aws-provisioner/test-c4-2xlarge'
-  - 'queue:create-task:aws-provisioner/test-c4-2xlarge'
-  - 'queue:define-task:aws-provisioner/build-c4-2xlarge'
-  - 'queue:create-task:aws-provisioner/build-c4-2xlarge'
-  - "docker-worker:cache:tc-vcs"
-  - "docker-worker:image:quay.io/mozilla/builder:0.0.30"
-  - "queue:define-task:aws-provisioner/build-c4-2xlarge"
-  - "queue:create-task:aws-provisioner/build-c4-2xlarge"
-  - "docker-worker:cache:sources-gecko"
-  - "docker-worker:cache:build-mulet-linux-objects"
-  - "docker-worker:cache:tooltool-cache"
-  - "docker-worker:image:quay.io/mozilla/tester:0.0.9"
+  # Note the below scopes are insecure however these get overriden on the server
+  # side to whatever scopes are set by mozilla-taskcluster.
+  - queue:*
+  - docker-worker:*
+  - scheduler:*
 
 tasks:
   - taskId: '{{#as_slugid}}decision task{{/as_slugid}}'
     task:
       created: '{{now}}'
       deadline: '{{#from_now}}1 day{{/from_now}}'
       metadata:
+        owner: mozilla-taskcluster-maintenance@mozilla.com
         source: {{{source}}}
-        owner: {{owner}}
         name: "[tc] Initial decision task for try ({{comment}})"
         description: |
           This is the single most important task as it decides how all other tasks
           get built.
 
       workerType: "gecko-decision"
       provisionerId: "aws-provisioner"
 
+      tags:
+        createdForUser: {{owner}}
+
       scopes:
         - "docker-worker:cache:tc-vcs-public-sources"
         - "docker-worker:image:quay.io/mozilla/decision:0.0.3"
         - "queue:route:tc-treeherder-stage.{{project}}.{{revision_hash}}"
         - "queue:route:tc-treeherder.{{project}}.{{revision_hash}}"
 
       routes:
         - "tc-treeherder-stage.{{project}}.{{revision_hash}}"

--- a/testing/taskcluster/tasks/phone_build.yml
+++ b/testing/taskcluster/tasks/phone_build.yml
@@ -3,17 +3,19 @@
 ---
 taskId: {{build_slugid}}
 
 task:
   created: '{{now}}'
   deadline: '{{#from_now}}24 hours{{/from_now}}'
   metadata:
     source: http://todo.com/soon
-    owner: {{owner}}
+    owner: mozilla-taskcluster-maintenance@mozilla.com
+  tags:
+    createdForUser: {{owner}}
 
   workerType: b2gbuild
   provisionerId: aws-provisioner
 
   scopes:
     # Nearly all of our build tasks use tc-vcs so just include the scope across
     # the board.
     - 'docker-worker:cache:tc-vcs'

--- a/testing/taskcluster/tasks/test.yml
+++ b/testing/taskcluster/tasks/test.yml
@@ -1,15 +1,17 @@
 # This task is the base for most tests in gecko.
 task:
   created: '{{now}}'
   deadline: '{{#from_now}}24 hours{{/from_now}}'
   metadata:
     source: http://todo.com/soon
-    owner: {{owner}}
+    owner: mozilla-taskcluster-maintenance@mozilla.com
+  tags:
+    createdForUser: {{owner}}
   workerType: b2gtest
   provisionerId: aws-provisioner
   schedulerId: task-graph-scheduler
 
   scopes:
     - 'docker-worker:image:{{#docker_image}}tester{{/docker_image}}'
     - 'queue:define-task:aws-provisioner/test-c4-2xlarge'
     - 'queue:create-task:aws-provisioner/test-c4-2xlarge'