diff --git a/README.txt b/README.txt
index 7d42cef897ba..a21632c5cc0f 100644
--- a/README.txt
+++ b/README.txt
@@ -26,3 +26,4 @@ testing, may be buggy. Firefox nightlies, for example, can be found at:
             - or -
     http://nightly.mozilla.org/
 
+
diff --git a/testing/taskcluster/tasks/build.yml b/testing/taskcluster/tasks/build.yml
index 3417af8bfb53..ec91de529a44 100644
--- a/testing/taskcluster/tasks/build.yml
+++ b/testing/taskcluster/tasks/build.yml
@@ -8,7 +8,10 @@ task:
   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
diff --git a/testing/taskcluster/tasks/decision/branch.yml b/testing/taskcluster/tasks/decision/branch.yml
index 6be425793e56..86fc09c6be37 100644
--- a/testing/taskcluster/tasks/decision/branch.yml
+++ b/testing/taskcluster/tasks/decision/branch.yml
@@ -3,7 +3,7 @@ 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:
@@ -18,13 +18,16 @@ tasks:
       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"
 
diff --git a/testing/taskcluster/tasks/decision/try.yml b/testing/taskcluster/tasks/decision/try.yml
index 14189b858c55..692645dc6eb8 100644
--- a/testing/taskcluster/tasks/decision/try.yml
+++ b/testing/taskcluster/tasks/decision/try.yml
@@ -3,28 +3,15 @@ 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}}'
@@ -32,8 +19,8 @@ tasks:
       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
@@ -42,6 +29,9 @@ tasks:
       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"
diff --git a/testing/taskcluster/tasks/phone_build.yml b/testing/taskcluster/tasks/phone_build.yml
index 7ce780eed55c..59a967904467 100644
--- a/testing/taskcluster/tasks/phone_build.yml
+++ b/testing/taskcluster/tasks/phone_build.yml
@@ -8,7 +8,9 @@ task:
   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
diff --git a/testing/taskcluster/tasks/test.yml b/testing/taskcluster/tasks/test.yml
index 2bc4cf0617c5..f5fa07309ba6 100644
--- a/testing/taskcluster/tasks/test.yml
+++ b/testing/taskcluster/tasks/test.yml
@@ -4,7 +4,9 @@ task:
   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