diff --git a/build/gen-permissions.sh b/build/gen-permissions.sh
index 3a279dfbb..66f10c8b4 100755
--- a/build/gen-permissions.sh
+++ b/build/gen-permissions.sh
@@ -38,6 +38,10 @@ EOM
 for permObject in $(jq -c "${JQ_PROG} | .[]" "${json}"); do
   principal=$(jq -r .principal <<< "${permObject}")
   for perm in $(jq -r '.permissions[]' <<< "${permObject}"); do
-    echo "- \"GROUP:${perm}:${principal}\""
+    if [[ "${principal}" == *@* ]] || [[ "${principal}" == "anonymous" ]]; then
+        echo "- \"USER:${perm}:${principal}\""
+    else
+        echo "- \"GROUP:${perm}:${principal}\""
+    fi
   done
 done
diff --git a/instances/foundation-internal.infra/target/jenkins/configuration.yml b/instances/foundation-internal.infra/target/jenkins/configuration.yml
index 70d255e28..764461d2d 100644
--- a/instances/foundation-internal.infra/target/jenkins/configuration.yml
+++ b/instances/foundation-internal.infra/target/jenkins/configuration.yml
@@ -52,7 +52,7 @@ jenkins:
         - "GROUP:View/Delete:foundation-internal.it"
         - "GROUP:View/Read:foundation-internal.it"
         - "GROUP:Overall/Read:foundation-internal.webdev"
-        - "GROUP:Overall/Read:wayne.beaton@eclipse-foundation.org"
+        - "USER:Overall/Read:wayne.beaton@eclipse-foundation.org"
   markupFormatter: rawHtml
   crumbIssuer:
     standard:
diff --git a/instances/foundation-internal.infra/target/jenkins/partials/permissions.hbs b/instances/foundation-internal.infra/target/jenkins/partials/permissions.hbs
index b3b0aad23..758931dd3 100644
--- a/instances/foundation-internal.infra/target/jenkins/partials/permissions.hbs
+++ b/instances/foundation-internal.infra/target/jenkins/partials/permissions.hbs
@@ -19,4 +19,4 @@
 - "GROUP:View/Delete:foundation-internal.it"
 - "GROUP:View/Read:foundation-internal.it"
 - "GROUP:Overall/Read:foundation-internal.webdev"
-- "GROUP:Overall/Read:wayne.beaton@eclipse-foundation.org"
+- "USER:Overall/Read:wayne.beaton@eclipse-foundation.org"
diff --git a/instances/foundation-internal.infra/target/jenkins/plugins.log b/instances/foundation-internal.infra/target/jenkins/plugins.log
index d1628bca0..7f6298aa9 100644
--- a/instances/foundation-internal.infra/target/jenkins/plugins.log
+++ b/instances/foundation-internal.infra/target/jenkins/plugins.log
@@ -48,7 +48,7 @@ h2-api 1.4.199
 handlebars 3.0.8
 handy-uri-templates-2-api 2.1.8-1.0
 jackson2-api 2.13.1-246.va8a9f3eaf46a
-javadoc 1.6
+javadoc 217.v905b_86277a_2a_
 javax-activation-api 1.2.0-2
 javax-mail-api 1.6.2-5
 jdk-tool 1.5
@@ -77,7 +77,7 @@ pipeline-build-step 2.15
 pipeline-graph-analysis 188.v3a01e7973f2c
 pipeline-input-step 446.vf27b_0b_83500e
 pipeline-maven 3.10.0
-pipeline-milestone-step 1.3.2
+pipeline-milestone-step 100.v60a_03cd446e1
 pipeline-model-api 1.9.3
 pipeline-model-definition 1.9.3
 pipeline-model-extensions 1.9.3
@@ -90,13 +90,13 @@ plugin-util-api 2.13.0
 popper-api 1.16.1-2
 popper2-api 2.11.2-1
 prism-api 1.25.0-2
-promoted-builds 3.11
+promoted-builds 867.v7c3a_b_83a_eb_79
 rebuild 1.33
 resource-disposer 0.17
 run-condition 1.5
 scm-api 595.vd5a_df5eb_0e39
 script-security 1131.v8b_b_5eda_c328e
-simple-theme-plugin 0.7
+simple-theme-plugin 103.va_161d09c38c7
 snakeyaml-api 1.29.1
 sonar 2.14
 ssh-agent 1.24.1
@@ -105,7 +105,7 @@ ssh-slaves 1.33.0
 sshd 3.1.0
 structs 308.v852b473a2b8c
 timestamper 1.17
-token-macro 267.vcdaea6462991
+token-macro 270.v8c2ce50dc4fc
 trilead-api 1.0.13
 variant 1.4
 warnings-ng 9.11.0
@@ -192,11 +192,9 @@ workflow-support 813.vb_d7c3d2984a_0
 Plugins that will be downloaded:
 docker-commons 1.19
 docker-workflow 1.28
-javadoc 217.v905b_86277a_2a_
 kubernetes-cli 1.10.3
 mail-watcher-plugin 1.16
 slack 602.v0da_f7458945d
-token-macro 270.v8c2ce50dc4fc
 
 Resulting plugin list:
 ace-editor 1.1
@@ -280,7 +278,7 @@ pipeline-build-step 2.15
 pipeline-graph-analysis 188.v3a01e7973f2c
 pipeline-input-step 446.vf27b_0b_83500e
 pipeline-maven 3.10.0
-pipeline-milestone-step 1.3.2
+pipeline-milestone-step 100.v60a_03cd446e1
 pipeline-model-api 1.9.3
 pipeline-model-definition 1.9.3
 pipeline-model-extensions 1.9.3
@@ -293,13 +291,13 @@ plugin-util-api 2.13.0
 popper-api 1.16.1-2
 popper2-api 2.11.2-1
 prism-api 1.25.0-2
-promoted-builds 3.11
+promoted-builds 867.v7c3a_b_83a_eb_79
 rebuild 1.33
 resource-disposer 0.17
 run-condition 1.5
 scm-api 595.vd5a_df5eb_0e39
 script-security 1131.v8b_b_5eda_c328e
-simple-theme-plugin 0.7
+simple-theme-plugin 103.va_161d09c38c7
 slack 602.v0da_f7458945d
 snakeyaml-api 1.29.1
 sonar 2.14
diff --git a/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml b/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml
index 4d75a2ac4..ac53cad02 100644
--- a/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml
+++ b/instances/foundation-internal.infra/target/k8s/configmap-jenkins-config.yml
@@ -75,7 +75,7 @@ data:
             - "GROUP:View/Delete:foundation-internal.it"
             - "GROUP:View/Read:foundation-internal.it"
             - "GROUP:Overall/Read:foundation-internal.webdev"
-            - "GROUP:Overall/Read:wayne.beaton@eclipse-foundation.org"
+            - "USER:Overall/Read:wayne.beaton@eclipse-foundation.org"
       markupFormatter: rawHtml
       crumbIssuer:
         standard:
diff --git a/instances/foundation-internal.webdev/target/jenkins/configuration.yml b/instances/foundation-internal.webdev/target/jenkins/configuration.yml
index 93b88bab0..042911f4e 100644
--- a/instances/foundation-internal.webdev/target/jenkins/configuration.yml
+++ b/instances/foundation-internal.webdev/target/jenkins/configuration.yml
@@ -32,7 +32,7 @@ jenkins:
     projectMatrix:
       permissions:
         - "GROUP:Overall/Administer:admins"
-        - "GROUP:Overall/Read:anonymous"
+        - "USER:Overall/Read:anonymous"
         - "GROUP:Agent/Build:foundation-internal.webdev"
         - "GROUP:Credentials/View:foundation-internal.webdev"
         - "GROUP:Gerrit/ManualTrigger:foundation-internal.webdev"
diff --git a/instances/foundation-internal.webdev/target/jenkins/partials/permissions.hbs b/instances/foundation-internal.webdev/target/jenkins/partials/permissions.hbs
index 123fba393..b22778dd6 100644
--- a/instances/foundation-internal.webdev/target/jenkins/partials/permissions.hbs
+++ b/instances/foundation-internal.webdev/target/jenkins/partials/permissions.hbs
@@ -1,5 +1,5 @@
 - "GROUP:Overall/Administer:admins"
-- "GROUP:Overall/Read:anonymous"
+- "USER:Overall/Read:anonymous"
 - "GROUP:Agent/Build:foundation-internal.webdev"
 - "GROUP:Credentials/View:foundation-internal.webdev"
 - "GROUP:Gerrit/ManualTrigger:foundation-internal.webdev"
diff --git a/instances/foundation-internal.webdev/target/jenkins/plugins.log b/instances/foundation-internal.webdev/target/jenkins/plugins.log
index 07b83d145..3e1d96b79 100644
--- a/instances/foundation-internal.webdev/target/jenkins/plugins.log
+++ b/instances/foundation-internal.webdev/target/jenkins/plugins.log
@@ -48,7 +48,7 @@ h2-api 1.4.199
 handlebars 3.0.8
 handy-uri-templates-2-api 2.1.8-1.0
 jackson2-api 2.13.1-246.va8a9f3eaf46a
-javadoc 1.6
+javadoc 217.v905b_86277a_2a_
 javax-activation-api 1.2.0-2
 javax-mail-api 1.6.2-5
 jdk-tool 1.5
@@ -77,7 +77,7 @@ pipeline-build-step 2.15
 pipeline-graph-analysis 188.v3a01e7973f2c
 pipeline-input-step 446.vf27b_0b_83500e
 pipeline-maven 3.10.0
-pipeline-milestone-step 1.3.2
+pipeline-milestone-step 100.v60a_03cd446e1
 pipeline-model-api 1.9.3
 pipeline-model-definition 1.9.3
 pipeline-model-extensions 1.9.3
@@ -90,13 +90,13 @@ plugin-util-api 2.13.0
 popper-api 1.16.1-2
 popper2-api 2.11.2-1
 prism-api 1.25.0-2
-promoted-builds 3.11
+promoted-builds 867.v7c3a_b_83a_eb_79
 rebuild 1.33
 resource-disposer 0.17
 run-condition 1.5
 scm-api 595.vd5a_df5eb_0e39
 script-security 1131.v8b_b_5eda_c328e
-simple-theme-plugin 0.7
+simple-theme-plugin 103.va_161d09c38c7
 snakeyaml-api 1.29.1
 sonar 2.14
 ssh-agent 1.24.1
@@ -105,7 +105,7 @@ ssh-slaves 1.33.0
 sshd 3.1.0
 structs 308.v852b473a2b8c
 timestamper 1.17
-token-macro 267.vcdaea6462991
+token-macro 270.v8c2ce50dc4fc
 trilead-api 1.0.13
 variant 1.4
 warnings-ng 9.11.0
@@ -195,12 +195,10 @@ Plugins that will be downloaded:
 disable-failed-job 1.15
 docker-commons 1.19
 docker-workflow 1.28
-javadoc 217.v905b_86277a_2a_
 kubernetes-cli 1.10.3
 mail-watcher-plugin 1.16
 openshift-client 1.0.35
 slack 602.v0da_f7458945d
-token-macro 270.v8c2ce50dc4fc
 
 Resulting plugin list:
 ace-editor 1.1
@@ -286,7 +284,7 @@ pipeline-build-step 2.15
 pipeline-graph-analysis 188.v3a01e7973f2c
 pipeline-input-step 446.vf27b_0b_83500e
 pipeline-maven 3.10.0
-pipeline-milestone-step 1.3.2
+pipeline-milestone-step 100.v60a_03cd446e1
 pipeline-model-api 1.9.3
 pipeline-model-definition 1.9.3
 pipeline-model-extensions 1.9.3
@@ -299,13 +297,13 @@ plugin-util-api 2.13.0
 popper-api 1.16.1-2
 popper2-api 2.11.2-1
 prism-api 1.25.0-2
-promoted-builds 3.11
+promoted-builds 867.v7c3a_b_83a_eb_79
 rebuild 1.33
 resource-disposer 0.17
 run-condition 1.5
 scm-api 595.vd5a_df5eb_0e39
 script-security 1131.v8b_b_5eda_c328e
-simple-theme-plugin 0.7
+simple-theme-plugin 103.va_161d09c38c7
 slack 602.v0da_f7458945d
 snakeyaml-api 1.29.1
 sonar 2.14
diff --git a/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml b/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml
index 548bc323b..4b44ecde6 100644
--- a/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml
+++ b/instances/foundation-internal.webdev/target/k8s/configmap-jenkins-config.yml
@@ -55,7 +55,7 @@ data:
         projectMatrix:
           permissions:
             - "GROUP:Overall/Administer:admins"
-            - "GROUP:Overall/Read:anonymous"
+            - "USER:Overall/Read:anonymous"
             - "GROUP:Agent/Build:foundation-internal.webdev"
             - "GROUP:Credentials/View:foundation-internal.webdev"
             - "GROUP:Gerrit/ManualTrigger:foundation-internal.webdev"
diff --git a/instances/rt.ecf/config.jsonnet b/instances/rt.ecf/config.jsonnet
index 579bef398..5d4e88834 100644
--- a/instances/rt.ecf/config.jsonnet
+++ b/instances/rt.ecf/config.jsonnet
@@ -9,7 +9,7 @@ local permissionsTemplates = import '../../templates/permissions.libsonnet';
     permissions+: [
       {
         // https://bugs.eclipse.org/bugs/show_bug.cgi?id=546758
-        principal: "mat.booth@redhat.com", 
+        principal: "mat.booth@gmail.com", 
         grantedPermissions: permissionsTemplates.committerPermissionsList + ["Gerrit/ManualTrigger", "Gerrit/Retrigger"],
       }
     ],
diff --git a/instances/rt.ecf/target/config.json b/instances/rt.ecf/target/config.json
index a4ba988e4..8713c4ed9 100644
--- a/instances/rt.ecf/target/config.json
+++ b/instances/rt.ecf/target/config.json
@@ -414,7 +414,7 @@
                "Gerrit/ManualTrigger",
                "Gerrit/Retrigger"
             ],
-            "principal": "mat.booth@redhat.com"
+            "principal": "mat.booth@gmail.com"
          }
       ],
       "plugins": [
diff --git a/instances/rt.ecf/target/jenkins/configuration.yml b/instances/rt.ecf/target/jenkins/configuration.yml
index 193027eed..e2fa7e3b9 100644
--- a/instances/rt.ecf/target/jenkins/configuration.yml
+++ b/instances/rt.ecf/target/jenkins/configuration.yml
@@ -22,30 +22,30 @@ jenkins:
     projectMatrix:
       permissions:
         - "GROUP:Overall/Administer:admins"
-        - "GROUP:Job/Read:anonymous"
-        - "GROUP:Overall/Read:anonymous"
+        - "USER:Job/Read:anonymous"
+        - "USER:Overall/Read:anonymous"
         - "GROUP:Job/ExtendedRead:common"
-        - "GROUP:Agent/Build:mat.booth@redhat.com"
-        - "GROUP:Credentials/View:mat.booth@redhat.com"
-        - "GROUP:Gerrit/ManualTrigger:mat.booth@redhat.com"
-        - "GROUP:Gerrit/Retrigger:mat.booth@redhat.com"
-        - "GROUP:Job/Build:mat.booth@redhat.com"
-        - "GROUP:Job/Cancel:mat.booth@redhat.com"
-        - "GROUP:Job/Configure:mat.booth@redhat.com"
-        - "GROUP:Job/Create:mat.booth@redhat.com"
-        - "GROUP:Job/Delete:mat.booth@redhat.com"
-        - "GROUP:Job/Move:mat.booth@redhat.com"
-        - "GROUP:Job/Read:mat.booth@redhat.com"
-        - "GROUP:Job/Workspace:mat.booth@redhat.com"
-        - "GROUP:Overall/Read:mat.booth@redhat.com"
-        - "GROUP:Run/Delete:mat.booth@redhat.com"
-        - "GROUP:Run/Replay:mat.booth@redhat.com"
-        - "GROUP:Run/Update:mat.booth@redhat.com"
-        - "GROUP:SCM/Tag:mat.booth@redhat.com"
-        - "GROUP:View/Configure:mat.booth@redhat.com"
-        - "GROUP:View/Create:mat.booth@redhat.com"
-        - "GROUP:View/Delete:mat.booth@redhat.com"
-        - "GROUP:View/Read:mat.booth@redhat.com"
+        - "USER:Agent/Build:mat.booth@gmail.com"
+        - "USER:Credentials/View:mat.booth@gmail.com"
+        - "USER:Gerrit/ManualTrigger:mat.booth@gmail.com"
+        - "USER:Gerrit/Retrigger:mat.booth@gmail.com"
+        - "USER:Job/Build:mat.booth@gmail.com"
+        - "USER:Job/Cancel:mat.booth@gmail.com"
+        - "USER:Job/Configure:mat.booth@gmail.com"
+        - "USER:Job/Create:mat.booth@gmail.com"
+        - "USER:Job/Delete:mat.booth@gmail.com"
+        - "USER:Job/Move:mat.booth@gmail.com"
+        - "USER:Job/Read:mat.booth@gmail.com"
+        - "USER:Job/Workspace:mat.booth@gmail.com"
+        - "USER:Overall/Read:mat.booth@gmail.com"
+        - "USER:Run/Delete:mat.booth@gmail.com"
+        - "USER:Run/Replay:mat.booth@gmail.com"
+        - "USER:Run/Update:mat.booth@gmail.com"
+        - "USER:SCM/Tag:mat.booth@gmail.com"
+        - "USER:View/Configure:mat.booth@gmail.com"
+        - "USER:View/Create:mat.booth@gmail.com"
+        - "USER:View/Delete:mat.booth@gmail.com"
+        - "USER:View/Read:mat.booth@gmail.com"
         - "GROUP:Agent/Build:rt.ecf"
         - "GROUP:Credentials/View:rt.ecf"
         - "GROUP:Gerrit/ManualTrigger:rt.ecf"
diff --git a/instances/rt.ecf/target/jenkins/partials/permissions.hbs b/instances/rt.ecf/target/jenkins/partials/permissions.hbs
index 66a31316a..24e2e33c5 100644
--- a/instances/rt.ecf/target/jenkins/partials/permissions.hbs
+++ b/instances/rt.ecf/target/jenkins/partials/permissions.hbs
@@ -1,28 +1,28 @@
 - "GROUP:Overall/Administer:admins"
-- "GROUP:Job/Read:anonymous"
-- "GROUP:Overall/Read:anonymous"
+- "USER:Job/Read:anonymous"
+- "USER:Overall/Read:anonymous"
 - "GROUP:Job/ExtendedRead:common"
-- "GROUP:Agent/Build:mat.booth@redhat.com"
-- "GROUP:Credentials/View:mat.booth@redhat.com"
-- "GROUP:Gerrit/ManualTrigger:mat.booth@redhat.com"
-- "GROUP:Gerrit/Retrigger:mat.booth@redhat.com"
-- "GROUP:Job/Build:mat.booth@redhat.com"
-- "GROUP:Job/Cancel:mat.booth@redhat.com"
-- "GROUP:Job/Configure:mat.booth@redhat.com"
-- "GROUP:Job/Create:mat.booth@redhat.com"
-- "GROUP:Job/Delete:mat.booth@redhat.com"
-- "GROUP:Job/Move:mat.booth@redhat.com"
-- "GROUP:Job/Read:mat.booth@redhat.com"
-- "GROUP:Job/Workspace:mat.booth@redhat.com"
-- "GROUP:Overall/Read:mat.booth@redhat.com"
-- "GROUP:Run/Delete:mat.booth@redhat.com"
-- "GROUP:Run/Replay:mat.booth@redhat.com"
-- "GROUP:Run/Update:mat.booth@redhat.com"
-- "GROUP:SCM/Tag:mat.booth@redhat.com"
-- "GROUP:View/Configure:mat.booth@redhat.com"
-- "GROUP:View/Create:mat.booth@redhat.com"
-- "GROUP:View/Delete:mat.booth@redhat.com"
-- "GROUP:View/Read:mat.booth@redhat.com"
+- "USER:Agent/Build:mat.booth@gmail.com"
+- "USER:Credentials/View:mat.booth@gmail.com"
+- "USER:Gerrit/ManualTrigger:mat.booth@gmail.com"
+- "USER:Gerrit/Retrigger:mat.booth@gmail.com"
+- "USER:Job/Build:mat.booth@gmail.com"
+- "USER:Job/Cancel:mat.booth@gmail.com"
+- "USER:Job/Configure:mat.booth@gmail.com"
+- "USER:Job/Create:mat.booth@gmail.com"
+- "USER:Job/Delete:mat.booth@gmail.com"
+- "USER:Job/Move:mat.booth@gmail.com"
+- "USER:Job/Read:mat.booth@gmail.com"
+- "USER:Job/Workspace:mat.booth@gmail.com"
+- "USER:Overall/Read:mat.booth@gmail.com"
+- "USER:Run/Delete:mat.booth@gmail.com"
+- "USER:Run/Replay:mat.booth@gmail.com"
+- "USER:Run/Update:mat.booth@gmail.com"
+- "USER:SCM/Tag:mat.booth@gmail.com"
+- "USER:View/Configure:mat.booth@gmail.com"
+- "USER:View/Create:mat.booth@gmail.com"
+- "USER:View/Delete:mat.booth@gmail.com"
+- "USER:View/Read:mat.booth@gmail.com"
 - "GROUP:Agent/Build:rt.ecf"
 - "GROUP:Credentials/View:rt.ecf"
 - "GROUP:Gerrit/ManualTrigger:rt.ecf"
diff --git a/instances/rt.ecf/target/jenkins/plugins.log b/instances/rt.ecf/target/jenkins/plugins.log
index 98a2f51c7..9f564de1a 100644
--- a/instances/rt.ecf/target/jenkins/plugins.log
+++ b/instances/rt.ecf/target/jenkins/plugins.log
@@ -48,7 +48,7 @@ h2-api 1.4.199
 handlebars 3.0.8
 handy-uri-templates-2-api 2.1.8-1.0
 jackson2-api 2.13.1-246.va8a9f3eaf46a
-javadoc 1.6
+javadoc 217.v905b_86277a_2a_
 javax-activation-api 1.2.0-2
 javax-mail-api 1.6.2-5
 jdk-tool 1.5
@@ -77,7 +77,7 @@ pipeline-build-step 2.15
 pipeline-graph-analysis 188.v3a01e7973f2c
 pipeline-input-step 446.vf27b_0b_83500e
 pipeline-maven 3.10.0
-pipeline-milestone-step 1.3.2
+pipeline-milestone-step 100.v60a_03cd446e1
 pipeline-model-api 1.9.3
 pipeline-model-definition 1.9.3
 pipeline-model-extensions 1.9.3
@@ -90,13 +90,13 @@ plugin-util-api 2.13.0
 popper-api 1.16.1-2
 popper2-api 2.11.2-1
 prism-api 1.25.0-2
-promoted-builds 3.11
+promoted-builds 867.v7c3a_b_83a_eb_79
 rebuild 1.33
 resource-disposer 0.17
 run-condition 1.5
 scm-api 595.vd5a_df5eb_0e39
 script-security 1131.v8b_b_5eda_c328e
-simple-theme-plugin 0.7
+simple-theme-plugin 103.va_161d09c38c7
 snakeyaml-api 1.29.1
 sonar 2.14
 ssh-agent 1.24.1
@@ -105,7 +105,7 @@ ssh-slaves 1.33.0
 sshd 3.1.0
 structs 308.v852b473a2b8c
 timestamper 1.17
-token-macro 267.vcdaea6462991
+token-macro 270.v8c2ce50dc4fc
 trilead-api 1.0.13
 variant 1.4
 warnings-ng 9.11.0
@@ -205,7 +205,7 @@ h2-api 1.4.199
 handlebars 3.0.8
 handy-uri-templates-2-api 2.1.8-1.0
 jackson2-api 2.13.1-246.va8a9f3eaf46a
-javadoc 1.6
+javadoc 217.v905b_86277a_2a_
 javax-activation-api 1.2.0-2
 javax-mail-api 1.6.2-5
 jdk-tool 1.5
@@ -234,7 +234,7 @@ pipeline-build-step 2.15
 pipeline-graph-analysis 188.v3a01e7973f2c
 pipeline-input-step 446.vf27b_0b_83500e
 pipeline-maven 3.10.0
-pipeline-milestone-step 1.3.2
+pipeline-milestone-step 100.v60a_03cd446e1
 pipeline-model-api 1.9.3
 pipeline-model-definition 1.9.3
 pipeline-model-extensions 1.9.3
@@ -247,13 +247,13 @@ plugin-util-api 2.13.0
 popper-api 1.16.1-2
 popper2-api 2.11.2-1
 prism-api 1.25.0-2
-promoted-builds 3.11
+promoted-builds 867.v7c3a_b_83a_eb_79
 rebuild 1.33
 resource-disposer 0.17
 run-condition 1.5
 scm-api 595.vd5a_df5eb_0e39
 script-security 1131.v8b_b_5eda_c328e
-simple-theme-plugin 0.7
+simple-theme-plugin 103.va_161d09c38c7
 snakeyaml-api 1.29.1
 sonar 2.14
 ssh-agent 1.24.1
@@ -262,7 +262,7 @@ ssh-slaves 1.33.0
 sshd 3.1.0
 structs 308.v852b473a2b8c
 timestamper 1.17
-token-macro 267.vcdaea6462991
+token-macro 270.v8c2ce50dc4fc
 trilead-api 1.0.13
 variant 1.4
 warnings-ng 9.11.0
diff --git a/instances/rt.ecf/target/k8s/configmap-jenkins-config.yml b/instances/rt.ecf/target/k8s/configmap-jenkins-config.yml
index c52509a19..ea36baca0 100644
--- a/instances/rt.ecf/target/k8s/configmap-jenkins-config.yml
+++ b/instances/rt.ecf/target/k8s/configmap-jenkins-config.yml
@@ -45,30 +45,30 @@ data:
         projectMatrix:
           permissions:
             - "GROUP:Overall/Administer:admins"
-            - "GROUP:Job/Read:anonymous"
-            - "GROUP:Overall/Read:anonymous"
+            - "USER:Job/Read:anonymous"
+            - "USER:Overall/Read:anonymous"
             - "GROUP:Job/ExtendedRead:common"
-            - "GROUP:Agent/Build:mat.booth@redhat.com"
-            - "GROUP:Credentials/View:mat.booth@redhat.com"
-            - "GROUP:Gerrit/ManualTrigger:mat.booth@redhat.com"
-            - "GROUP:Gerrit/Retrigger:mat.booth@redhat.com"
-            - "GROUP:Job/Build:mat.booth@redhat.com"
-            - "GROUP:Job/Cancel:mat.booth@redhat.com"
-            - "GROUP:Job/Configure:mat.booth@redhat.com"
-            - "GROUP:Job/Create:mat.booth@redhat.com"
-            - "GROUP:Job/Delete:mat.booth@redhat.com"
-            - "GROUP:Job/Move:mat.booth@redhat.com"
-            - "GROUP:Job/Read:mat.booth@redhat.com"
-            - "GROUP:Job/Workspace:mat.booth@redhat.com"
-            - "GROUP:Overall/Read:mat.booth@redhat.com"
-            - "GROUP:Run/Delete:mat.booth@redhat.com"
-            - "GROUP:Run/Replay:mat.booth@redhat.com"
-            - "GROUP:Run/Update:mat.booth@redhat.com"
-            - "GROUP:SCM/Tag:mat.booth@redhat.com"
-            - "GROUP:View/Configure:mat.booth@redhat.com"
-            - "GROUP:View/Create:mat.booth@redhat.com"
-            - "GROUP:View/Delete:mat.booth@redhat.com"
-            - "GROUP:View/Read:mat.booth@redhat.com"
+            - "USER:Agent/Build:mat.booth@gmail.com"
+            - "USER:Credentials/View:mat.booth@gmail.com"
+            - "USER:Gerrit/ManualTrigger:mat.booth@gmail.com"
+            - "USER:Gerrit/Retrigger:mat.booth@gmail.com"
+            - "USER:Job/Build:mat.booth@gmail.com"
+            - "USER:Job/Cancel:mat.booth@gmail.com"
+            - "USER:Job/Configure:mat.booth@gmail.com"
+            - "USER:Job/Create:mat.booth@gmail.com"
+            - "USER:Job/Delete:mat.booth@gmail.com"
+            - "USER:Job/Move:mat.booth@gmail.com"
+            - "USER:Job/Read:mat.booth@gmail.com"
+            - "USER:Job/Workspace:mat.booth@gmail.com"
+            - "USER:Overall/Read:mat.booth@gmail.com"
+            - "USER:Run/Delete:mat.booth@gmail.com"
+            - "USER:Run/Replay:mat.booth@gmail.com"
+            - "USER:Run/Update:mat.booth@gmail.com"
+            - "USER:SCM/Tag:mat.booth@gmail.com"
+            - "USER:View/Configure:mat.booth@gmail.com"
+            - "USER:View/Create:mat.booth@gmail.com"
+            - "USER:View/Delete:mat.booth@gmail.com"
+            - "USER:View/Read:mat.booth@gmail.com"
             - "GROUP:Agent/Build:rt.ecf"
             - "GROUP:Credentials/View:rt.ecf"
             - "GROUP:Gerrit/ManualTrigger:rt.ecf"
diff --git a/instances/rt.jetty/target/jenkins/configuration.yml b/instances/rt.jetty/target/jenkins/configuration.yml
index a2aafc6a2..b58da1b26 100644
--- a/instances/rt.jetty/target/jenkins/configuration.yml
+++ b/instances/rt.jetty/target/jenkins/configuration.yml
@@ -22,85 +22,85 @@ jenkins:
     projectMatrix:
       permissions:
         - "GROUP:Overall/Administer:admins"
-        - "GROUP:Agent/Build:akurtako@redhat.com"
-        - "GROUP:Credentials/View:akurtako@redhat.com"
-        - "GROUP:Job/Build:akurtako@redhat.com"
-        - "GROUP:Job/Cancel:akurtako@redhat.com"
-        - "GROUP:Job/Configure:akurtako@redhat.com"
-        - "GROUP:Job/Create:akurtako@redhat.com"
-        - "GROUP:Job/Delete:akurtako@redhat.com"
-        - "GROUP:Job/Move:akurtako@redhat.com"
-        - "GROUP:Job/Read:akurtako@redhat.com"
-        - "GROUP:Job/Workspace:akurtako@redhat.com"
-        - "GROUP:Overall/Read:akurtako@redhat.com"
-        - "GROUP:Run/Delete:akurtako@redhat.com"
-        - "GROUP:Run/Replay:akurtako@redhat.com"
-        - "GROUP:Run/Update:akurtako@redhat.com"
-        - "GROUP:SCM/Tag:akurtako@redhat.com"
-        - "GROUP:View/Configure:akurtako@redhat.com"
-        - "GROUP:View/Create:akurtako@redhat.com"
-        - "GROUP:View/Delete:akurtako@redhat.com"
-        - "GROUP:View/Read:akurtako@redhat.com"
-        - "GROUP:Job/Read:anonymous"
-        - "GROUP:Overall/Read:anonymous"
+        - "USER:Agent/Build:akurtako@redhat.com"
+        - "USER:Credentials/View:akurtako@redhat.com"
+        - "USER:Job/Build:akurtako@redhat.com"
+        - "USER:Job/Cancel:akurtako@redhat.com"
+        - "USER:Job/Configure:akurtako@redhat.com"
+        - "USER:Job/Create:akurtako@redhat.com"
+        - "USER:Job/Delete:akurtako@redhat.com"
+        - "USER:Job/Move:akurtako@redhat.com"
+        - "USER:Job/Read:akurtako@redhat.com"
+        - "USER:Job/Workspace:akurtako@redhat.com"
+        - "USER:Overall/Read:akurtako@redhat.com"
+        - "USER:Run/Delete:akurtako@redhat.com"
+        - "USER:Run/Replay:akurtako@redhat.com"
+        - "USER:Run/Update:akurtako@redhat.com"
+        - "USER:SCM/Tag:akurtako@redhat.com"
+        - "USER:View/Configure:akurtako@redhat.com"
+        - "USER:View/Create:akurtako@redhat.com"
+        - "USER:View/Delete:akurtako@redhat.com"
+        - "USER:View/Read:akurtako@redhat.com"
+        - "USER:Job/Read:anonymous"
+        - "USER:Overall/Read:anonymous"
         - "GROUP:Job/ExtendedRead:common"
-        - "GROUP:Agent/Build:kitlo@us.ibm.com"
-        - "GROUP:Credentials/View:kitlo@us.ibm.com"
-        - "GROUP:Job/Build:kitlo@us.ibm.com"
-        - "GROUP:Job/Cancel:kitlo@us.ibm.com"
-        - "GROUP:Job/Configure:kitlo@us.ibm.com"
-        - "GROUP:Job/Create:kitlo@us.ibm.com"
-        - "GROUP:Job/Delete:kitlo@us.ibm.com"
-        - "GROUP:Job/Move:kitlo@us.ibm.com"
-        - "GROUP:Job/Read:kitlo@us.ibm.com"
-        - "GROUP:Job/Workspace:kitlo@us.ibm.com"
-        - "GROUP:Overall/Read:kitlo@us.ibm.com"
-        - "GROUP:Run/Delete:kitlo@us.ibm.com"
-        - "GROUP:Run/Replay:kitlo@us.ibm.com"
-        - "GROUP:Run/Update:kitlo@us.ibm.com"
-        - "GROUP:SCM/Tag:kitlo@us.ibm.com"
-        - "GROUP:View/Configure:kitlo@us.ibm.com"
-        - "GROUP:View/Create:kitlo@us.ibm.com"
-        - "GROUP:View/Delete:kitlo@us.ibm.com"
-        - "GROUP:View/Read:kitlo@us.ibm.com"
-        - "GROUP:Agent/Build:matthias.sohn@sap.com"
-        - "GROUP:Credentials/View:matthias.sohn@sap.com"
-        - "GROUP:Job/Build:matthias.sohn@sap.com"
-        - "GROUP:Job/Cancel:matthias.sohn@sap.com"
-        - "GROUP:Job/Configure:matthias.sohn@sap.com"
-        - "GROUP:Job/Create:matthias.sohn@sap.com"
-        - "GROUP:Job/Delete:matthias.sohn@sap.com"
-        - "GROUP:Job/Move:matthias.sohn@sap.com"
-        - "GROUP:Job/Read:matthias.sohn@sap.com"
-        - "GROUP:Job/Workspace:matthias.sohn@sap.com"
-        - "GROUP:Overall/Read:matthias.sohn@sap.com"
-        - "GROUP:Run/Delete:matthias.sohn@sap.com"
-        - "GROUP:Run/Replay:matthias.sohn@sap.com"
-        - "GROUP:Run/Update:matthias.sohn@sap.com"
-        - "GROUP:SCM/Tag:matthias.sohn@sap.com"
-        - "GROUP:View/Configure:matthias.sohn@sap.com"
-        - "GROUP:View/Create:matthias.sohn@sap.com"
-        - "GROUP:View/Delete:matthias.sohn@sap.com"
-        - "GROUP:View/Read:matthias.sohn@sap.com"
-        - "GROUP:Agent/Build:rgrunber@redhat.com"
-        - "GROUP:Credentials/View:rgrunber@redhat.com"
-        - "GROUP:Job/Build:rgrunber@redhat.com"
-        - "GROUP:Job/Cancel:rgrunber@redhat.com"
-        - "GROUP:Job/Configure:rgrunber@redhat.com"
-        - "GROUP:Job/Create:rgrunber@redhat.com"
-        - "GROUP:Job/Delete:rgrunber@redhat.com"
-        - "GROUP:Job/Move:rgrunber@redhat.com"
-        - "GROUP:Job/Read:rgrunber@redhat.com"
-        - "GROUP:Job/Workspace:rgrunber@redhat.com"
-        - "GROUP:Overall/Read:rgrunber@redhat.com"
-        - "GROUP:Run/Delete:rgrunber@redhat.com"
-        - "GROUP:Run/Replay:rgrunber@redhat.com"
-        - "GROUP:Run/Update:rgrunber@redhat.com"
-        - "GROUP:SCM/Tag:rgrunber@redhat.com"
-        - "GROUP:View/Configure:rgrunber@redhat.com"
-        - "GROUP:View/Create:rgrunber@redhat.com"
-        - "GROUP:View/Delete:rgrunber@redhat.com"
-        - "GROUP:View/Read:rgrunber@redhat.com"
+        - "USER:Agent/Build:kitlo@us.ibm.com"
+        - "USER:Credentials/View:kitlo@us.ibm.com"
+        - "USER:Job/Build:kitlo@us.ibm.com"
+        - "USER:Job/Cancel:kitlo@us.ibm.com"
+        - "USER:Job/Configure:kitlo@us.ibm.com"
+        - "USER:Job/Create:kitlo@us.ibm.com"
+        - "USER:Job/Delete:kitlo@us.ibm.com"
+        - "USER:Job/Move:kitlo@us.ibm.com"
+        - "USER:Job/Read:kitlo@us.ibm.com"
+        - "USER:Job/Workspace:kitlo@us.ibm.com"
+        - "USER:Overall/Read:kitlo@us.ibm.com"
+        - "USER:Run/Delete:kitlo@us.ibm.com"
+        - "USER:Run/Replay:kitlo@us.ibm.com"
+        - "USER:Run/Update:kitlo@us.ibm.com"
+        - "USER:SCM/Tag:kitlo@us.ibm.com"
+        - "USER:View/Configure:kitlo@us.ibm.com"
+        - "USER:View/Create:kitlo@us.ibm.com"
+        - "USER:View/Delete:kitlo@us.ibm.com"
+        - "USER:View/Read:kitlo@us.ibm.com"
+        - "USER:Agent/Build:matthias.sohn@sap.com"
+        - "USER:Credentials/View:matthias.sohn@sap.com"
+        - "USER:Job/Build:matthias.sohn@sap.com"
+        - "USER:Job/Cancel:matthias.sohn@sap.com"
+        - "USER:Job/Configure:matthias.sohn@sap.com"
+        - "USER:Job/Create:matthias.sohn@sap.com"
+        - "USER:Job/Delete:matthias.sohn@sap.com"
+        - "USER:Job/Move:matthias.sohn@sap.com"
+        - "USER:Job/Read:matthias.sohn@sap.com"
+        - "USER:Job/Workspace:matthias.sohn@sap.com"
+        - "USER:Overall/Read:matthias.sohn@sap.com"
+        - "USER:Run/Delete:matthias.sohn@sap.com"
+        - "USER:Run/Replay:matthias.sohn@sap.com"
+        - "USER:Run/Update:matthias.sohn@sap.com"
+        - "USER:SCM/Tag:matthias.sohn@sap.com"
+        - "USER:View/Configure:matthias.sohn@sap.com"
+        - "USER:View/Create:matthias.sohn@sap.com"
+        - "USER:View/Delete:matthias.sohn@sap.com"
+        - "USER:View/Read:matthias.sohn@sap.com"
+        - "USER:Agent/Build:rgrunber@redhat.com"
+        - "USER:Credentials/View:rgrunber@redhat.com"
+        - "USER:Job/Build:rgrunber@redhat.com"
+        - "USER:Job/Cancel:rgrunber@redhat.com"
+        - "USER:Job/Configure:rgrunber@redhat.com"
+        - "USER:Job/Create:rgrunber@redhat.com"
+        - "USER:Job/Delete:rgrunber@redhat.com"
+        - "USER:Job/Move:rgrunber@redhat.com"
+        - "USER:Job/Read:rgrunber@redhat.com"
+        - "USER:Job/Workspace:rgrunber@redhat.com"
+        - "USER:Overall/Read:rgrunber@redhat.com"
+        - "USER:Run/Delete:rgrunber@redhat.com"
+        - "USER:Run/Replay:rgrunber@redhat.com"
+        - "USER:Run/Update:rgrunber@redhat.com"
+        - "USER:SCM/Tag:rgrunber@redhat.com"
+        - "USER:View/Configure:rgrunber@redhat.com"
+        - "USER:View/Create:rgrunber@redhat.com"
+        - "USER:View/Delete:rgrunber@redhat.com"
+        - "USER:View/Read:rgrunber@redhat.com"
         - "GROUP:Agent/Build:rt.jetty"
         - "GROUP:Credentials/View:rt.jetty"
         - "GROUP:Gerrit/ManualTrigger:rt.jetty"
diff --git a/instances/rt.jetty/target/jenkins/partials/permissions.hbs b/instances/rt.jetty/target/jenkins/partials/permissions.hbs
index 7e35206cd..68212ec60 100644
--- a/instances/rt.jetty/target/jenkins/partials/permissions.hbs
+++ b/instances/rt.jetty/target/jenkins/partials/permissions.hbs
@@ -1,83 +1,83 @@
 - "GROUP:Overall/Administer:admins"
-- "GROUP:Agent/Build:akurtako@redhat.com"
-- "GROUP:Credentials/View:akurtako@redhat.com"
-- "GROUP:Job/Build:akurtako@redhat.com"
-- "GROUP:Job/Cancel:akurtako@redhat.com"
-- "GROUP:Job/Configure:akurtako@redhat.com"
-- "GROUP:Job/Create:akurtako@redhat.com"
-- "GROUP:Job/Delete:akurtako@redhat.com"
-- "GROUP:Job/Move:akurtako@redhat.com"
-- "GROUP:Job/Read:akurtako@redhat.com"
-- "GROUP:Job/Workspace:akurtako@redhat.com"
-- "GROUP:Overall/Read:akurtako@redhat.com"
-- "GROUP:Run/Delete:akurtako@redhat.com"
-- "GROUP:Run/Replay:akurtako@redhat.com"
-- "GROUP:Run/Update:akurtako@redhat.com"
-- "GROUP:SCM/Tag:akurtako@redhat.com"
-- "GROUP:View/Configure:akurtako@redhat.com"
-- "GROUP:View/Create:akurtako@redhat.com"
-- "GROUP:View/Delete:akurtako@redhat.com"
-- "GROUP:View/Read:akurtako@redhat.com"
-- "GROUP:Job/Read:anonymous"
-- "GROUP:Overall/Read:anonymous"
+- "USER:Agent/Build:akurtako@redhat.com"
+- "USER:Credentials/View:akurtako@redhat.com"
+- "USER:Job/Build:akurtako@redhat.com"
+- "USER:Job/Cancel:akurtako@redhat.com"
+- "USER:Job/Configure:akurtako@redhat.com"
+- "USER:Job/Create:akurtako@redhat.com"
+- "USER:Job/Delete:akurtako@redhat.com"
+- "USER:Job/Move:akurtako@redhat.com"
+- "USER:Job/Read:akurtako@redhat.com"
+- "USER:Job/Workspace:akurtako@redhat.com"
+- "USER:Overall/Read:akurtako@redhat.com"
+- "USER:Run/Delete:akurtako@redhat.com"
+- "USER:Run/Replay:akurtako@redhat.com"
+- "USER:Run/Update:akurtako@redhat.com"
+- "USER:SCM/Tag:akurtako@redhat.com"
+- "USER:View/Configure:akurtako@redhat.com"
+- "USER:View/Create:akurtako@redhat.com"
+- "USER:View/Delete:akurtako@redhat.com"
+- "USER:View/Read:akurtako@redhat.com"
+- "USER:Job/Read:anonymous"
+- "USER:Overall/Read:anonymous"
 - "GROUP:Job/ExtendedRead:common"
-- "GROUP:Agent/Build:kitlo@us.ibm.com"
-- "GROUP:Credentials/View:kitlo@us.ibm.com"
-- "GROUP:Job/Build:kitlo@us.ibm.com"
-- "GROUP:Job/Cancel:kitlo@us.ibm.com"
-- "GROUP:Job/Configure:kitlo@us.ibm.com"
-- "GROUP:Job/Create:kitlo@us.ibm.com"
-- "GROUP:Job/Delete:kitlo@us.ibm.com"
-- "GROUP:Job/Move:kitlo@us.ibm.com"
-- "GROUP:Job/Read:kitlo@us.ibm.com"
-- "GROUP:Job/Workspace:kitlo@us.ibm.com"
-- "GROUP:Overall/Read:kitlo@us.ibm.com"
-- "GROUP:Run/Delete:kitlo@us.ibm.com"
-- "GROUP:Run/Replay:kitlo@us.ibm.com"
-- "GROUP:Run/Update:kitlo@us.ibm.com"
-- "GROUP:SCM/Tag:kitlo@us.ibm.com"
-- "GROUP:View/Configure:kitlo@us.ibm.com"
-- "GROUP:View/Create:kitlo@us.ibm.com"
-- "GROUP:View/Delete:kitlo@us.ibm.com"
-- "GROUP:View/Read:kitlo@us.ibm.com"
-- "GROUP:Agent/Build:matthias.sohn@sap.com"
-- "GROUP:Credentials/View:matthias.sohn@sap.com"
-- "GROUP:Job/Build:matthias.sohn@sap.com"
-- "GROUP:Job/Cancel:matthias.sohn@sap.com"
-- "GROUP:Job/Configure:matthias.sohn@sap.com"
-- "GROUP:Job/Create:matthias.sohn@sap.com"
-- "GROUP:Job/Delete:matthias.sohn@sap.com"
-- "GROUP:Job/Move:matthias.sohn@sap.com"
-- "GROUP:Job/Read:matthias.sohn@sap.com"
-- "GROUP:Job/Workspace:matthias.sohn@sap.com"
-- "GROUP:Overall/Read:matthias.sohn@sap.com"
-- "GROUP:Run/Delete:matthias.sohn@sap.com"
-- "GROUP:Run/Replay:matthias.sohn@sap.com"
-- "GROUP:Run/Update:matthias.sohn@sap.com"
-- "GROUP:SCM/Tag:matthias.sohn@sap.com"
-- "GROUP:View/Configure:matthias.sohn@sap.com"
-- "GROUP:View/Create:matthias.sohn@sap.com"
-- "GROUP:View/Delete:matthias.sohn@sap.com"
-- "GROUP:View/Read:matthias.sohn@sap.com"
-- "GROUP:Agent/Build:rgrunber@redhat.com"
-- "GROUP:Credentials/View:rgrunber@redhat.com"
-- "GROUP:Job/Build:rgrunber@redhat.com"
-- "GROUP:Job/Cancel:rgrunber@redhat.com"
-- "GROUP:Job/Configure:rgrunber@redhat.com"
-- "GROUP:Job/Create:rgrunber@redhat.com"
-- "GROUP:Job/Delete:rgrunber@redhat.com"
-- "GROUP:Job/Move:rgrunber@redhat.com"
-- "GROUP:Job/Read:rgrunber@redhat.com"
-- "GROUP:Job/Workspace:rgrunber@redhat.com"
-- "GROUP:Overall/Read:rgrunber@redhat.com"
-- "GROUP:Run/Delete:rgrunber@redhat.com"
-- "GROUP:Run/Replay:rgrunber@redhat.com"
-- "GROUP:Run/Update:rgrunber@redhat.com"
-- "GROUP:SCM/Tag:rgrunber@redhat.com"
-- "GROUP:View/Configure:rgrunber@redhat.com"
-- "GROUP:View/Create:rgrunber@redhat.com"
-- "GROUP:View/Delete:rgrunber@redhat.com"
-- "GROUP:View/Read:rgrunber@redhat.com"
+- "USER:Agent/Build:kitlo@us.ibm.com"
+- "USER:Credentials/View:kitlo@us.ibm.com"
+- "USER:Job/Build:kitlo@us.ibm.com"
+- "USER:Job/Cancel:kitlo@us.ibm.com"
+- "USER:Job/Configure:kitlo@us.ibm.com"
+- "USER:Job/Create:kitlo@us.ibm.com"
+- "USER:Job/Delete:kitlo@us.ibm.com"
+- "USER:Job/Move:kitlo@us.ibm.com"
+- "USER:Job/Read:kitlo@us.ibm.com"
+- "USER:Job/Workspace:kitlo@us.ibm.com"
+- "USER:Overall/Read:kitlo@us.ibm.com"
+- "USER:Run/Delete:kitlo@us.ibm.com"
+- "USER:Run/Replay:kitlo@us.ibm.com"
+- "USER:Run/Update:kitlo@us.ibm.com"
+- "USER:SCM/Tag:kitlo@us.ibm.com"
+- "USER:View/Configure:kitlo@us.ibm.com"
+- "USER:View/Create:kitlo@us.ibm.com"
+- "USER:View/Delete:kitlo@us.ibm.com"
+- "USER:View/Read:kitlo@us.ibm.com"
+- "USER:Agent/Build:matthias.sohn@sap.com"
+- "USER:Credentials/View:matthias.sohn@sap.com"
+- "USER:Job/Build:matthias.sohn@sap.com"
+- "USER:Job/Cancel:matthias.sohn@sap.com"
+- "USER:Job/Configure:matthias.sohn@sap.com"
+- "USER:Job/Create:matthias.sohn@sap.com"
+- "USER:Job/Delete:matthias.sohn@sap.com"
+- "USER:Job/Move:matthias.sohn@sap.com"
+- "USER:Job/Read:matthias.sohn@sap.com"
+- "USER:Job/Workspace:matthias.sohn@sap.com"
+- "USER:Overall/Read:matthias.sohn@sap.com"
+- "USER:Run/Delete:matthias.sohn@sap.com"
+- "USER:Run/Replay:matthias.sohn@sap.com"
+- "USER:Run/Update:matthias.sohn@sap.com"
+- "USER:SCM/Tag:matthias.sohn@sap.com"
+- "USER:View/Configure:matthias.sohn@sap.com"
+- "USER:View/Create:matthias.sohn@sap.com"
+- "USER:View/Delete:matthias.sohn@sap.com"
+- "USER:View/Read:matthias.sohn@sap.com"
+- "USER:Agent/Build:rgrunber@redhat.com"
+- "USER:Credentials/View:rgrunber@redhat.com"
+- "USER:Job/Build:rgrunber@redhat.com"
+- "USER:Job/Cancel:rgrunber@redhat.com"
+- "USER:Job/Configure:rgrunber@redhat.com"
+- "USER:Job/Create:rgrunber@redhat.com"
+- "USER:Job/Delete:rgrunber@redhat.com"
+- "USER:Job/Move:rgrunber@redhat.com"
+- "USER:Job/Read:rgrunber@redhat.com"
+- "USER:Job/Workspace:rgrunber@redhat.com"
+- "USER:Overall/Read:rgrunber@redhat.com"
+- "USER:Run/Delete:rgrunber@redhat.com"
+- "USER:Run/Replay:rgrunber@redhat.com"
+- "USER:Run/Update:rgrunber@redhat.com"
+- "USER:SCM/Tag:rgrunber@redhat.com"
+- "USER:View/Configure:rgrunber@redhat.com"
+- "USER:View/Create:rgrunber@redhat.com"
+- "USER:View/Delete:rgrunber@redhat.com"
+- "USER:View/Read:rgrunber@redhat.com"
 - "GROUP:Agent/Build:rt.jetty"
 - "GROUP:Credentials/View:rt.jetty"
 - "GROUP:Gerrit/ManualTrigger:rt.jetty"
diff --git a/instances/rt.jetty/target/k8s/configmap-jenkins-config.yml b/instances/rt.jetty/target/k8s/configmap-jenkins-config.yml
index dc570b758..6bff1a7eb 100644
--- a/instances/rt.jetty/target/k8s/configmap-jenkins-config.yml
+++ b/instances/rt.jetty/target/k8s/configmap-jenkins-config.yml
@@ -45,85 +45,85 @@ data:
         projectMatrix:
           permissions:
             - "GROUP:Overall/Administer:admins"
-            - "GROUP:Agent/Build:akurtako@redhat.com"
-            - "GROUP:Credentials/View:akurtako@redhat.com"
-            - "GROUP:Job/Build:akurtako@redhat.com"
-            - "GROUP:Job/Cancel:akurtako@redhat.com"
-            - "GROUP:Job/Configure:akurtako@redhat.com"
-            - "GROUP:Job/Create:akurtako@redhat.com"
-            - "GROUP:Job/Delete:akurtako@redhat.com"
-            - "GROUP:Job/Move:akurtako@redhat.com"
-            - "GROUP:Job/Read:akurtako@redhat.com"
-            - "GROUP:Job/Workspace:akurtako@redhat.com"
-            - "GROUP:Overall/Read:akurtako@redhat.com"
-            - "GROUP:Run/Delete:akurtako@redhat.com"
-            - "GROUP:Run/Replay:akurtako@redhat.com"
-            - "GROUP:Run/Update:akurtako@redhat.com"
-            - "GROUP:SCM/Tag:akurtako@redhat.com"
-            - "GROUP:View/Configure:akurtako@redhat.com"
-            - "GROUP:View/Create:akurtako@redhat.com"
-            - "GROUP:View/Delete:akurtako@redhat.com"
-            - "GROUP:View/Read:akurtako@redhat.com"
-            - "GROUP:Job/Read:anonymous"
-            - "GROUP:Overall/Read:anonymous"
+            - "USER:Agent/Build:akurtako@redhat.com"
+            - "USER:Credentials/View:akurtako@redhat.com"
+            - "USER:Job/Build:akurtako@redhat.com"
+            - "USER:Job/Cancel:akurtako@redhat.com"
+            - "USER:Job/Configure:akurtako@redhat.com"
+            - "USER:Job/Create:akurtako@redhat.com"
+            - "USER:Job/Delete:akurtako@redhat.com"
+            - "USER:Job/Move:akurtako@redhat.com"
+            - "USER:Job/Read:akurtako@redhat.com"
+            - "USER:Job/Workspace:akurtako@redhat.com"
+            - "USER:Overall/Read:akurtako@redhat.com"
+            - "USER:Run/Delete:akurtako@redhat.com"
+            - "USER:Run/Replay:akurtako@redhat.com"
+            - "USER:Run/Update:akurtako@redhat.com"
+            - "USER:SCM/Tag:akurtako@redhat.com"
+            - "USER:View/Configure:akurtako@redhat.com"
+            - "USER:View/Create:akurtako@redhat.com"
+            - "USER:View/Delete:akurtako@redhat.com"
+            - "USER:View/Read:akurtako@redhat.com"
+            - "USER:Job/Read:anonymous"
+            - "USER:Overall/Read:anonymous"
             - "GROUP:Job/ExtendedRead:common"
-            - "GROUP:Agent/Build:kitlo@us.ibm.com"
-            - "GROUP:Credentials/View:kitlo@us.ibm.com"
-            - "GROUP:Job/Build:kitlo@us.ibm.com"
-            - "GROUP:Job/Cancel:kitlo@us.ibm.com"
-            - "GROUP:Job/Configure:kitlo@us.ibm.com"
-            - "GROUP:Job/Create:kitlo@us.ibm.com"
-            - "GROUP:Job/Delete:kitlo@us.ibm.com"
-            - "GROUP:Job/Move:kitlo@us.ibm.com"
-            - "GROUP:Job/Read:kitlo@us.ibm.com"
-            - "GROUP:Job/Workspace:kitlo@us.ibm.com"
-            - "GROUP:Overall/Read:kitlo@us.ibm.com"
-            - "GROUP:Run/Delete:kitlo@us.ibm.com"
-            - "GROUP:Run/Replay:kitlo@us.ibm.com"
-            - "GROUP:Run/Update:kitlo@us.ibm.com"
-            - "GROUP:SCM/Tag:kitlo@us.ibm.com"
-            - "GROUP:View/Configure:kitlo@us.ibm.com"
-            - "GROUP:View/Create:kitlo@us.ibm.com"
-            - "GROUP:View/Delete:kitlo@us.ibm.com"
-            - "GROUP:View/Read:kitlo@us.ibm.com"
-            - "GROUP:Agent/Build:matthias.sohn@sap.com"
-            - "GROUP:Credentials/View:matthias.sohn@sap.com"
-            - "GROUP:Job/Build:matthias.sohn@sap.com"
-            - "GROUP:Job/Cancel:matthias.sohn@sap.com"
-            - "GROUP:Job/Configure:matthias.sohn@sap.com"
-            - "GROUP:Job/Create:matthias.sohn@sap.com"
-            - "GROUP:Job/Delete:matthias.sohn@sap.com"
-            - "GROUP:Job/Move:matthias.sohn@sap.com"
-            - "GROUP:Job/Read:matthias.sohn@sap.com"
-            - "GROUP:Job/Workspace:matthias.sohn@sap.com"
-            - "GROUP:Overall/Read:matthias.sohn@sap.com"
-            - "GROUP:Run/Delete:matthias.sohn@sap.com"
-            - "GROUP:Run/Replay:matthias.sohn@sap.com"
-            - "GROUP:Run/Update:matthias.sohn@sap.com"
-            - "GROUP:SCM/Tag:matthias.sohn@sap.com"
-            - "GROUP:View/Configure:matthias.sohn@sap.com"
-            - "GROUP:View/Create:matthias.sohn@sap.com"
-            - "GROUP:View/Delete:matthias.sohn@sap.com"
-            - "GROUP:View/Read:matthias.sohn@sap.com"
-            - "GROUP:Agent/Build:rgrunber@redhat.com"
-            - "GROUP:Credentials/View:rgrunber@redhat.com"
-            - "GROUP:Job/Build:rgrunber@redhat.com"
-            - "GROUP:Job/Cancel:rgrunber@redhat.com"
-            - "GROUP:Job/Configure:rgrunber@redhat.com"
-            - "GROUP:Job/Create:rgrunber@redhat.com"
-            - "GROUP:Job/Delete:rgrunber@redhat.com"
-            - "GROUP:Job/Move:rgrunber@redhat.com"
-            - "GROUP:Job/Read:rgrunber@redhat.com"
-            - "GROUP:Job/Workspace:rgrunber@redhat.com"
-            - "GROUP:Overall/Read:rgrunber@redhat.com"
-            - "GROUP:Run/Delete:rgrunber@redhat.com"
-            - "GROUP:Run/Replay:rgrunber@redhat.com"
-            - "GROUP:Run/Update:rgrunber@redhat.com"
-            - "GROUP:SCM/Tag:rgrunber@redhat.com"
-            - "GROUP:View/Configure:rgrunber@redhat.com"
-            - "GROUP:View/Create:rgrunber@redhat.com"
-            - "GROUP:View/Delete:rgrunber@redhat.com"
-            - "GROUP:View/Read:rgrunber@redhat.com"
+            - "USER:Agent/Build:kitlo@us.ibm.com"
+            - "USER:Credentials/View:kitlo@us.ibm.com"
+            - "USER:Job/Build:kitlo@us.ibm.com"
+            - "USER:Job/Cancel:kitlo@us.ibm.com"
+            - "USER:Job/Configure:kitlo@us.ibm.com"
+            - "USER:Job/Create:kitlo@us.ibm.com"
+            - "USER:Job/Delete:kitlo@us.ibm.com"
+            - "USER:Job/Move:kitlo@us.ibm.com"
+            - "USER:Job/Read:kitlo@us.ibm.com"
+            - "USER:Job/Workspace:kitlo@us.ibm.com"
+            - "USER:Overall/Read:kitlo@us.ibm.com"
+            - "USER:Run/Delete:kitlo@us.ibm.com"
+            - "USER:Run/Replay:kitlo@us.ibm.com"
+            - "USER:Run/Update:kitlo@us.ibm.com"
+            - "USER:SCM/Tag:kitlo@us.ibm.com"
+            - "USER:View/Configure:kitlo@us.ibm.com"
+            - "USER:View/Create:kitlo@us.ibm.com"
+            - "USER:View/Delete:kitlo@us.ibm.com"
+            - "USER:View/Read:kitlo@us.ibm.com"
+            - "USER:Agent/Build:matthias.sohn@sap.com"
+            - "USER:Credentials/View:matthias.sohn@sap.com"
+            - "USER:Job/Build:matthias.sohn@sap.com"
+            - "USER:Job/Cancel:matthias.sohn@sap.com"
+            - "USER:Job/Configure:matthias.sohn@sap.com"
+            - "USER:Job/Create:matthias.sohn@sap.com"
+            - "USER:Job/Delete:matthias.sohn@sap.com"
+            - "USER:Job/Move:matthias.sohn@sap.com"
+            - "USER:Job/Read:matthias.sohn@sap.com"
+            - "USER:Job/Workspace:matthias.sohn@sap.com"
+            - "USER:Overall/Read:matthias.sohn@sap.com"
+            - "USER:Run/Delete:matthias.sohn@sap.com"
+            - "USER:Run/Replay:matthias.sohn@sap.com"
+            - "USER:Run/Update:matthias.sohn@sap.com"
+            - "USER:SCM/Tag:matthias.sohn@sap.com"
+            - "USER:View/Configure:matthias.sohn@sap.com"
+            - "USER:View/Create:matthias.sohn@sap.com"
+            - "USER:View/Delete:matthias.sohn@sap.com"
+            - "USER:View/Read:matthias.sohn@sap.com"
+            - "USER:Agent/Build:rgrunber@redhat.com"
+            - "USER:Credentials/View:rgrunber@redhat.com"
+            - "USER:Job/Build:rgrunber@redhat.com"
+            - "USER:Job/Cancel:rgrunber@redhat.com"
+            - "USER:Job/Configure:rgrunber@redhat.com"
+            - "USER:Job/Create:rgrunber@redhat.com"
+            - "USER:Job/Delete:rgrunber@redhat.com"
+            - "USER:Job/Move:rgrunber@redhat.com"
+            - "USER:Job/Read:rgrunber@redhat.com"
+            - "USER:Job/Workspace:rgrunber@redhat.com"
+            - "USER:Overall/Read:rgrunber@redhat.com"
+            - "USER:Run/Delete:rgrunber@redhat.com"
+            - "USER:Run/Replay:rgrunber@redhat.com"
+            - "USER:Run/Update:rgrunber@redhat.com"
+            - "USER:SCM/Tag:rgrunber@redhat.com"
+            - "USER:View/Configure:rgrunber@redhat.com"
+            - "USER:View/Create:rgrunber@redhat.com"
+            - "USER:View/Delete:rgrunber@redhat.com"
+            - "USER:View/Read:rgrunber@redhat.com"
             - "GROUP:Agent/Build:rt.jetty"
             - "GROUP:Credentials/View:rt.jetty"
             - "GROUP:Gerrit/ManualTrigger:rt.jetty"
diff --git a/instances/technology.omr/target/jenkins/configuration.yml b/instances/technology.omr/target/jenkins/configuration.yml
index 5e627135b..2f2f0134f 100644
--- a/instances/technology.omr/target/jenkins/configuration.yml
+++ b/instances/technology.omr/target/jenkins/configuration.yml
@@ -582,28 +582,28 @@ jenkins:
   authorizationStrategy:
     projectMatrix:
       permissions:
-        - "GROUP:Agent/Build:adam.brousseau88@gmail.com"
-        - "GROUP:Agent/Configure:adam.brousseau88@gmail.com"
-        - "GROUP:Agent/Connect:adam.brousseau88@gmail.com"
-        - "GROUP:Agent/Disconnect:adam.brousseau88@gmail.com"
-        - "GROUP:Job/Build:adam.brousseau88@gmail.com"
-        - "GROUP:Job/Cancel:adam.brousseau88@gmail.com"
-        - "GROUP:Job/Configure:adam.brousseau88@gmail.com"
-        - "GROUP:Overall/SystemRead:adam.brousseau88@gmail.com"
+        - "USER:Agent/Build:adam.brousseau88@gmail.com"
+        - "USER:Agent/Configure:adam.brousseau88@gmail.com"
+        - "USER:Agent/Connect:adam.brousseau88@gmail.com"
+        - "USER:Agent/Disconnect:adam.brousseau88@gmail.com"
+        - "USER:Job/Build:adam.brousseau88@gmail.com"
+        - "USER:Job/Cancel:adam.brousseau88@gmail.com"
+        - "USER:Job/Configure:adam.brousseau88@gmail.com"
+        - "USER:Overall/SystemRead:adam.brousseau88@gmail.com"
         - "GROUP:Overall/Administer:admins"
-        - "GROUP:Job/Read:anonymous"
-        - "GROUP:Overall/Read:anonymous"
+        - "USER:Job/Read:anonymous"
+        - "USER:Overall/Read:anonymous"
         - "GROUP:Job/ExtendedRead:common"
-        - "GROUP:Agent/Build:joe_dekoning@ca.ibm.com"
-        - "GROUP:Agent/Configure:joe_dekoning@ca.ibm.com"
-        - "GROUP:Agent/Connect:joe_dekoning@ca.ibm.com"
-        - "GROUP:Agent/Disconnect:joe_dekoning@ca.ibm.com"
-        - "GROUP:Job/Build:joe_dekoning@ca.ibm.com"
-        - "GROUP:Job/Cancel:joe_dekoning@ca.ibm.com"
-        - "GROUP:Job/Configure:joe_dekoning@ca.ibm.com"
-        - "GROUP:Agent/Configure:rajdeep.singh@ibm.com"
-        - "GROUP:Agent/Connect:rajdeep.singh@ibm.com"
-        - "GROUP:Agent/Disconnect:rajdeep.singh@ibm.com"
+        - "USER:Agent/Build:joe_dekoning@ca.ibm.com"
+        - "USER:Agent/Configure:joe_dekoning@ca.ibm.com"
+        - "USER:Agent/Connect:joe_dekoning@ca.ibm.com"
+        - "USER:Agent/Disconnect:joe_dekoning@ca.ibm.com"
+        - "USER:Job/Build:joe_dekoning@ca.ibm.com"
+        - "USER:Job/Cancel:joe_dekoning@ca.ibm.com"
+        - "USER:Job/Configure:joe_dekoning@ca.ibm.com"
+        - "USER:Agent/Configure:rajdeep.singh@ibm.com"
+        - "USER:Agent/Connect:rajdeep.singh@ibm.com"
+        - "USER:Agent/Disconnect:rajdeep.singh@ibm.com"
         - "GROUP:Agent/Build:technology.omr"
         - "GROUP:Agent/Connect:technology.omr"
         - "GROUP:Agent/Disconnect:technology.omr"
diff --git a/instances/technology.omr/target/jenkins/partials/permissions.hbs b/instances/technology.omr/target/jenkins/partials/permissions.hbs
index 3fc6211bf..0ad15e68d 100644
--- a/instances/technology.omr/target/jenkins/partials/permissions.hbs
+++ b/instances/technology.omr/target/jenkins/partials/permissions.hbs
@@ -1,25 +1,25 @@
-- "GROUP:Agent/Build:adam.brousseau88@gmail.com"
-- "GROUP:Agent/Configure:adam.brousseau88@gmail.com"
-- "GROUP:Agent/Connect:adam.brousseau88@gmail.com"
-- "GROUP:Agent/Disconnect:adam.brousseau88@gmail.com"
-- "GROUP:Job/Build:adam.brousseau88@gmail.com"
-- "GROUP:Job/Cancel:adam.brousseau88@gmail.com"
-- "GROUP:Job/Configure:adam.brousseau88@gmail.com"
-- "GROUP:Overall/SystemRead:adam.brousseau88@gmail.com"
+- "USER:Agent/Build:adam.brousseau88@gmail.com"
+- "USER:Agent/Configure:adam.brousseau88@gmail.com"
+- "USER:Agent/Connect:adam.brousseau88@gmail.com"
+- "USER:Agent/Disconnect:adam.brousseau88@gmail.com"
+- "USER:Job/Build:adam.brousseau88@gmail.com"
+- "USER:Job/Cancel:adam.brousseau88@gmail.com"
+- "USER:Job/Configure:adam.brousseau88@gmail.com"
+- "USER:Overall/SystemRead:adam.brousseau88@gmail.com"
 - "GROUP:Overall/Administer:admins"
-- "GROUP:Job/Read:anonymous"
-- "GROUP:Overall/Read:anonymous"
+- "USER:Job/Read:anonymous"
+- "USER:Overall/Read:anonymous"
 - "GROUP:Job/ExtendedRead:common"
-- "GROUP:Agent/Build:joe_dekoning@ca.ibm.com"
-- "GROUP:Agent/Configure:joe_dekoning@ca.ibm.com"
-- "GROUP:Agent/Connect:joe_dekoning@ca.ibm.com"
-- "GROUP:Agent/Disconnect:joe_dekoning@ca.ibm.com"
-- "GROUP:Job/Build:joe_dekoning@ca.ibm.com"
-- "GROUP:Job/Cancel:joe_dekoning@ca.ibm.com"
-- "GROUP:Job/Configure:joe_dekoning@ca.ibm.com"
-- "GROUP:Agent/Configure:rajdeep.singh@ibm.com"
-- "GROUP:Agent/Connect:rajdeep.singh@ibm.com"
-- "GROUP:Agent/Disconnect:rajdeep.singh@ibm.com"
+- "USER:Agent/Build:joe_dekoning@ca.ibm.com"
+- "USER:Agent/Configure:joe_dekoning@ca.ibm.com"
+- "USER:Agent/Connect:joe_dekoning@ca.ibm.com"
+- "USER:Agent/Disconnect:joe_dekoning@ca.ibm.com"
+- "USER:Job/Build:joe_dekoning@ca.ibm.com"
+- "USER:Job/Cancel:joe_dekoning@ca.ibm.com"
+- "USER:Job/Configure:joe_dekoning@ca.ibm.com"
+- "USER:Agent/Configure:rajdeep.singh@ibm.com"
+- "USER:Agent/Connect:rajdeep.singh@ibm.com"
+- "USER:Agent/Disconnect:rajdeep.singh@ibm.com"
 - "GROUP:Agent/Build:technology.omr"
 - "GROUP:Agent/Connect:technology.omr"
 - "GROUP:Agent/Disconnect:technology.omr"
diff --git a/instances/technology.omr/target/k8s/configmap-jenkins-config.yml b/instances/technology.omr/target/k8s/configmap-jenkins-config.yml
index c57921903..a29eb4094 100644
--- a/instances/technology.omr/target/k8s/configmap-jenkins-config.yml
+++ b/instances/technology.omr/target/k8s/configmap-jenkins-config.yml
@@ -605,28 +605,28 @@ data:
       authorizationStrategy:
         projectMatrix:
           permissions:
-            - "GROUP:Agent/Build:adam.brousseau88@gmail.com"
-            - "GROUP:Agent/Configure:adam.brousseau88@gmail.com"
-            - "GROUP:Agent/Connect:adam.brousseau88@gmail.com"
-            - "GROUP:Agent/Disconnect:adam.brousseau88@gmail.com"
-            - "GROUP:Job/Build:adam.brousseau88@gmail.com"
-            - "GROUP:Job/Cancel:adam.brousseau88@gmail.com"
-            - "GROUP:Job/Configure:adam.brousseau88@gmail.com"
-            - "GROUP:Overall/SystemRead:adam.brousseau88@gmail.com"
+            - "USER:Agent/Build:adam.brousseau88@gmail.com"
+            - "USER:Agent/Configure:adam.brousseau88@gmail.com"
+            - "USER:Agent/Connect:adam.brousseau88@gmail.com"
+            - "USER:Agent/Disconnect:adam.brousseau88@gmail.com"
+            - "USER:Job/Build:adam.brousseau88@gmail.com"
+            - "USER:Job/Cancel:adam.brousseau88@gmail.com"
+            - "USER:Job/Configure:adam.brousseau88@gmail.com"
+            - "USER:Overall/SystemRead:adam.brousseau88@gmail.com"
             - "GROUP:Overall/Administer:admins"
-            - "GROUP:Job/Read:anonymous"
-            - "GROUP:Overall/Read:anonymous"
+            - "USER:Job/Read:anonymous"
+            - "USER:Overall/Read:anonymous"
             - "GROUP:Job/ExtendedRead:common"
-            - "GROUP:Agent/Build:joe_dekoning@ca.ibm.com"
-            - "GROUP:Agent/Configure:joe_dekoning@ca.ibm.com"
-            - "GROUP:Agent/Connect:joe_dekoning@ca.ibm.com"
-            - "GROUP:Agent/Disconnect:joe_dekoning@ca.ibm.com"
-            - "GROUP:Job/Build:joe_dekoning@ca.ibm.com"
-            - "GROUP:Job/Cancel:joe_dekoning@ca.ibm.com"
-            - "GROUP:Job/Configure:joe_dekoning@ca.ibm.com"
-            - "GROUP:Agent/Configure:rajdeep.singh@ibm.com"
-            - "GROUP:Agent/Connect:rajdeep.singh@ibm.com"
-            - "GROUP:Agent/Disconnect:rajdeep.singh@ibm.com"
+            - "USER:Agent/Build:joe_dekoning@ca.ibm.com"
+            - "USER:Agent/Configure:joe_dekoning@ca.ibm.com"
+            - "USER:Agent/Connect:joe_dekoning@ca.ibm.com"
+            - "USER:Agent/Disconnect:joe_dekoning@ca.ibm.com"
+            - "USER:Job/Build:joe_dekoning@ca.ibm.com"
+            - "USER:Job/Cancel:joe_dekoning@ca.ibm.com"
+            - "USER:Job/Configure:joe_dekoning@ca.ibm.com"
+            - "USER:Agent/Configure:rajdeep.singh@ibm.com"
+            - "USER:Agent/Connect:rajdeep.singh@ibm.com"
+            - "USER:Agent/Disconnect:rajdeep.singh@ibm.com"
             - "GROUP:Agent/Build:technology.omr"
             - "GROUP:Agent/Connect:technology.omr"
             - "GROUP:Agent/Disconnect:technology.omr"
diff --git a/instances/technology.xwt/target/jenkins/configuration.yml b/instances/technology.xwt/target/jenkins/configuration.yml
index 3b8b24b2b..fcff6a280 100644
--- a/instances/technology.xwt/target/jenkins/configuration.yml
+++ b/instances/technology.xwt/target/jenkins/configuration.yml
@@ -22,30 +22,30 @@ jenkins:
     projectMatrix:
       permissions:
         - "GROUP:Overall/Administer:admins"
-        - "GROUP:Job/Read:anonymous"
-        - "GROUP:Overall/Read:anonymous"
+        - "USER:Job/Read:anonymous"
+        - "USER:Overall/Read:anonymous"
         - "GROUP:Job/ExtendedRead:common"
-        - "GROUP:Agent/Build:patrick.tessier@cea.fr"
-        - "GROUP:Credentials/View:patrick.tessier@cea.fr"
-        - "GROUP:Gerrit/ManualTrigger:patrick.tessier@cea.fr"
-        - "GROUP:Gerrit/Retrigger:patrick.tessier@cea.fr"
-        - "GROUP:Job/Build:patrick.tessier@cea.fr"
-        - "GROUP:Job/Cancel:patrick.tessier@cea.fr"
-        - "GROUP:Job/Configure:patrick.tessier@cea.fr"
-        - "GROUP:Job/Create:patrick.tessier@cea.fr"
-        - "GROUP:Job/Delete:patrick.tessier@cea.fr"
-        - "GROUP:Job/Move:patrick.tessier@cea.fr"
-        - "GROUP:Job/Read:patrick.tessier@cea.fr"
-        - "GROUP:Job/Workspace:patrick.tessier@cea.fr"
-        - "GROUP:Overall/Read:patrick.tessier@cea.fr"
-        - "GROUP:Run/Delete:patrick.tessier@cea.fr"
-        - "GROUP:Run/Replay:patrick.tessier@cea.fr"
-        - "GROUP:Run/Update:patrick.tessier@cea.fr"
-        - "GROUP:SCM/Tag:patrick.tessier@cea.fr"
-        - "GROUP:View/Configure:patrick.tessier@cea.fr"
-        - "GROUP:View/Create:patrick.tessier@cea.fr"
-        - "GROUP:View/Delete:patrick.tessier@cea.fr"
-        - "GROUP:View/Read:patrick.tessier@cea.fr"
+        - "USER:Agent/Build:patrick.tessier@cea.fr"
+        - "USER:Credentials/View:patrick.tessier@cea.fr"
+        - "USER:Gerrit/ManualTrigger:patrick.tessier@cea.fr"
+        - "USER:Gerrit/Retrigger:patrick.tessier@cea.fr"
+        - "USER:Job/Build:patrick.tessier@cea.fr"
+        - "USER:Job/Cancel:patrick.tessier@cea.fr"
+        - "USER:Job/Configure:patrick.tessier@cea.fr"
+        - "USER:Job/Create:patrick.tessier@cea.fr"
+        - "USER:Job/Delete:patrick.tessier@cea.fr"
+        - "USER:Job/Move:patrick.tessier@cea.fr"
+        - "USER:Job/Read:patrick.tessier@cea.fr"
+        - "USER:Job/Workspace:patrick.tessier@cea.fr"
+        - "USER:Overall/Read:patrick.tessier@cea.fr"
+        - "USER:Run/Delete:patrick.tessier@cea.fr"
+        - "USER:Run/Replay:patrick.tessier@cea.fr"
+        - "USER:Run/Update:patrick.tessier@cea.fr"
+        - "USER:SCM/Tag:patrick.tessier@cea.fr"
+        - "USER:View/Configure:patrick.tessier@cea.fr"
+        - "USER:View/Create:patrick.tessier@cea.fr"
+        - "USER:View/Delete:patrick.tessier@cea.fr"
+        - "USER:View/Read:patrick.tessier@cea.fr"
         - "GROUP:Agent/Build:technology.xwt"
         - "GROUP:Credentials/View:technology.xwt"
         - "GROUP:Gerrit/ManualTrigger:technology.xwt"
diff --git a/instances/technology.xwt/target/jenkins/partials/permissions.hbs b/instances/technology.xwt/target/jenkins/partials/permissions.hbs
index bcd22a494..68f3a8dfc 100644
--- a/instances/technology.xwt/target/jenkins/partials/permissions.hbs
+++ b/instances/technology.xwt/target/jenkins/partials/permissions.hbs
@@ -1,28 +1,28 @@
 - "GROUP:Overall/Administer:admins"
-- "GROUP:Job/Read:anonymous"
-- "GROUP:Overall/Read:anonymous"
+- "USER:Job/Read:anonymous"
+- "USER:Overall/Read:anonymous"
 - "GROUP:Job/ExtendedRead:common"
-- "GROUP:Agent/Build:patrick.tessier@cea.fr"
-- "GROUP:Credentials/View:patrick.tessier@cea.fr"
-- "GROUP:Gerrit/ManualTrigger:patrick.tessier@cea.fr"
-- "GROUP:Gerrit/Retrigger:patrick.tessier@cea.fr"
-- "GROUP:Job/Build:patrick.tessier@cea.fr"
-- "GROUP:Job/Cancel:patrick.tessier@cea.fr"
-- "GROUP:Job/Configure:patrick.tessier@cea.fr"
-- "GROUP:Job/Create:patrick.tessier@cea.fr"
-- "GROUP:Job/Delete:patrick.tessier@cea.fr"
-- "GROUP:Job/Move:patrick.tessier@cea.fr"
-- "GROUP:Job/Read:patrick.tessier@cea.fr"
-- "GROUP:Job/Workspace:patrick.tessier@cea.fr"
-- "GROUP:Overall/Read:patrick.tessier@cea.fr"
-- "GROUP:Run/Delete:patrick.tessier@cea.fr"
-- "GROUP:Run/Replay:patrick.tessier@cea.fr"
-- "GROUP:Run/Update:patrick.tessier@cea.fr"
-- "GROUP:SCM/Tag:patrick.tessier@cea.fr"
-- "GROUP:View/Configure:patrick.tessier@cea.fr"
-- "GROUP:View/Create:patrick.tessier@cea.fr"
-- "GROUP:View/Delete:patrick.tessier@cea.fr"
-- "GROUP:View/Read:patrick.tessier@cea.fr"
+- "USER:Agent/Build:patrick.tessier@cea.fr"
+- "USER:Credentials/View:patrick.tessier@cea.fr"
+- "USER:Gerrit/ManualTrigger:patrick.tessier@cea.fr"
+- "USER:Gerrit/Retrigger:patrick.tessier@cea.fr"
+- "USER:Job/Build:patrick.tessier@cea.fr"
+- "USER:Job/Cancel:patrick.tessier@cea.fr"
+- "USER:Job/Configure:patrick.tessier@cea.fr"
+- "USER:Job/Create:patrick.tessier@cea.fr"
+- "USER:Job/Delete:patrick.tessier@cea.fr"
+- "USER:Job/Move:patrick.tessier@cea.fr"
+- "USER:Job/Read:patrick.tessier@cea.fr"
+- "USER:Job/Workspace:patrick.tessier@cea.fr"
+- "USER:Overall/Read:patrick.tessier@cea.fr"
+- "USER:Run/Delete:patrick.tessier@cea.fr"
+- "USER:Run/Replay:patrick.tessier@cea.fr"
+- "USER:Run/Update:patrick.tessier@cea.fr"
+- "USER:SCM/Tag:patrick.tessier@cea.fr"
+- "USER:View/Configure:patrick.tessier@cea.fr"
+- "USER:View/Create:patrick.tessier@cea.fr"
+- "USER:View/Delete:patrick.tessier@cea.fr"
+- "USER:View/Read:patrick.tessier@cea.fr"
 - "GROUP:Agent/Build:technology.xwt"
 - "GROUP:Credentials/View:technology.xwt"
 - "GROUP:Gerrit/ManualTrigger:technology.xwt"
diff --git a/instances/technology.xwt/target/k8s/configmap-jenkins-config.yml b/instances/technology.xwt/target/k8s/configmap-jenkins-config.yml
index 56ad2a447..e8135ab4c 100644
--- a/instances/technology.xwt/target/k8s/configmap-jenkins-config.yml
+++ b/instances/technology.xwt/target/k8s/configmap-jenkins-config.yml
@@ -45,30 +45,30 @@ data:
         projectMatrix:
           permissions:
             - "GROUP:Overall/Administer:admins"
-            - "GROUP:Job/Read:anonymous"
-            - "GROUP:Overall/Read:anonymous"
+            - "USER:Job/Read:anonymous"
+            - "USER:Overall/Read:anonymous"
             - "GROUP:Job/ExtendedRead:common"
-            - "GROUP:Agent/Build:patrick.tessier@cea.fr"
-            - "GROUP:Credentials/View:patrick.tessier@cea.fr"
-            - "GROUP:Gerrit/ManualTrigger:patrick.tessier@cea.fr"
-            - "GROUP:Gerrit/Retrigger:patrick.tessier@cea.fr"
-            - "GROUP:Job/Build:patrick.tessier@cea.fr"
-            - "GROUP:Job/Cancel:patrick.tessier@cea.fr"
-            - "GROUP:Job/Configure:patrick.tessier@cea.fr"
-            - "GROUP:Job/Create:patrick.tessier@cea.fr"
-            - "GROUP:Job/Delete:patrick.tessier@cea.fr"
-            - "GROUP:Job/Move:patrick.tessier@cea.fr"
-            - "GROUP:Job/Read:patrick.tessier@cea.fr"
-            - "GROUP:Job/Workspace:patrick.tessier@cea.fr"
-            - "GROUP:Overall/Read:patrick.tessier@cea.fr"
-            - "GROUP:Run/Delete:patrick.tessier@cea.fr"
-            - "GROUP:Run/Replay:patrick.tessier@cea.fr"
-            - "GROUP:Run/Update:patrick.tessier@cea.fr"
-            - "GROUP:SCM/Tag:patrick.tessier@cea.fr"
-            - "GROUP:View/Configure:patrick.tessier@cea.fr"
-            - "GROUP:View/Create:patrick.tessier@cea.fr"
-            - "GROUP:View/Delete:patrick.tessier@cea.fr"
-            - "GROUP:View/Read:patrick.tessier@cea.fr"
+            - "USER:Agent/Build:patrick.tessier@cea.fr"
+            - "USER:Credentials/View:patrick.tessier@cea.fr"
+            - "USER:Gerrit/ManualTrigger:patrick.tessier@cea.fr"
+            - "USER:Gerrit/Retrigger:patrick.tessier@cea.fr"
+            - "USER:Job/Build:patrick.tessier@cea.fr"
+            - "USER:Job/Cancel:patrick.tessier@cea.fr"
+            - "USER:Job/Configure:patrick.tessier@cea.fr"
+            - "USER:Job/Create:patrick.tessier@cea.fr"
+            - "USER:Job/Delete:patrick.tessier@cea.fr"
+            - "USER:Job/Move:patrick.tessier@cea.fr"
+            - "USER:Job/Read:patrick.tessier@cea.fr"
+            - "USER:Job/Workspace:patrick.tessier@cea.fr"
+            - "USER:Overall/Read:patrick.tessier@cea.fr"
+            - "USER:Run/Delete:patrick.tessier@cea.fr"
+            - "USER:Run/Replay:patrick.tessier@cea.fr"
+            - "USER:Run/Update:patrick.tessier@cea.fr"
+            - "USER:SCM/Tag:patrick.tessier@cea.fr"
+            - "USER:View/Configure:patrick.tessier@cea.fr"
+            - "USER:View/Create:patrick.tessier@cea.fr"
+            - "USER:View/Delete:patrick.tessier@cea.fr"
+            - "USER:View/Read:patrick.tessier@cea.fr"
             - "GROUP:Agent/Build:technology.xwt"
             - "GROUP:Credentials/View:technology.xwt"
             - "GROUP:Gerrit/ManualTrigger:technology.xwt"