diff --git a/instances/ee4j.openmq/config.jsonnet b/instances/ee4j.openmq/config.jsonnet
index c97ae086f..4ab4dc4f5 100644
--- a/instances/ee4j.openmq/config.jsonnet
+++ b/instances/ee4j.openmq/config.jsonnet
@@ -1,6 +1,11 @@
+local permissionsTemplates = import '../../templates/permissions.libsonnet';
 {
   project+: {
     fullName: "ee4j.openmq",
     displayName: "Eclipse OpenMQ",
   },
+  jenkins+: {
+    // workaround to avoid errors, when the Gerrit plugin is disabled
+    permissions: permissionsTemplates.projectPermissions($.project.unixGroupName, permissionsTemplates.committerPermissionsList),
+  },
 }
diff --git a/instances/ee4j.openmq/target/config.json b/instances/ee4j.openmq/target/config.json
index ad30c091c..b40fac993 100644
--- a/instances/ee4j.openmq/target/config.json
+++ b/instances/ee4j.openmq/target/config.json
@@ -384,9 +384,7 @@
                "View/Configure",
                "View/Create",
                "View/Delete",
-               "View/Read",
-               "Gerrit/ManualTrigger",
-               "Gerrit/Retrigger"
+               "View/Read"
             ],
             "principal": "ee4j.openmq"
          }
diff --git a/instances/ee4j.openmq/target/jenkins/configuration.yml b/instances/ee4j.openmq/target/jenkins/configuration.yml
index 7de394e08..8c55fd185 100644
--- a/instances/ee4j.openmq/target/jenkins/configuration.yml
+++ b/instances/ee4j.openmq/target/jenkins/configuration.yml
@@ -21,31 +21,29 @@ jenkins:
   authorizationStrategy:
     projectMatrix:
       permissions:
-        - "Overall/Administer:admins"
-        - "Job/Read:anonymous"
-        - "Overall/Read:anonymous"
-        - "Job/ExtendedRead:common"
-        - "Agent/Build:ee4j.openmq"
-        - "Credentials/View:ee4j.openmq"
-        - "Gerrit/ManualTrigger:ee4j.openmq"
-        - "Gerrit/Retrigger:ee4j.openmq"
-        - "Job/Build:ee4j.openmq"
-        - "Job/Cancel:ee4j.openmq"
-        - "Job/Configure:ee4j.openmq"
-        - "Job/Create:ee4j.openmq"
-        - "Job/Delete:ee4j.openmq"
-        - "Job/Move:ee4j.openmq"
-        - "Job/Read:ee4j.openmq"
-        - "Job/Workspace:ee4j.openmq"
-        - "Overall/Read:ee4j.openmq"
-        - "Run/Delete:ee4j.openmq"
-        - "Run/Replay:ee4j.openmq"
-        - "Run/Update:ee4j.openmq"
-        - "SCM/Tag:ee4j.openmq"
-        - "View/Configure:ee4j.openmq"
-        - "View/Create:ee4j.openmq"
-        - "View/Delete:ee4j.openmq"
-        - "View/Read:ee4j.openmq"
+        - "GROUP:Overall/Administer:admins"
+        - "GROUP:Job/Read:anonymous"
+        - "GROUP:Overall/Read:anonymous"
+        - "GROUP:Job/ExtendedRead:common"
+        - "GROUP:Agent/Build:ee4j.openmq"
+        - "GROUP:Credentials/View:ee4j.openmq"
+        - "GROUP:Job/Build:ee4j.openmq"
+        - "GROUP:Job/Cancel:ee4j.openmq"
+        - "GROUP:Job/Configure:ee4j.openmq"
+        - "GROUP:Job/Create:ee4j.openmq"
+        - "GROUP:Job/Delete:ee4j.openmq"
+        - "GROUP:Job/Move:ee4j.openmq"
+        - "GROUP:Job/Read:ee4j.openmq"
+        - "GROUP:Job/Workspace:ee4j.openmq"
+        - "GROUP:Overall/Read:ee4j.openmq"
+        - "GROUP:Run/Delete:ee4j.openmq"
+        - "GROUP:Run/Replay:ee4j.openmq"
+        - "GROUP:Run/Update:ee4j.openmq"
+        - "GROUP:SCM/Tag:ee4j.openmq"
+        - "GROUP:View/Configure:ee4j.openmq"
+        - "GROUP:View/Create:ee4j.openmq"
+        - "GROUP:View/Delete:ee4j.openmq"
+        - "GROUP:View/Read:ee4j.openmq"
 
   markupFormatter: rawHtml
   crumbIssuer:
diff --git a/instances/ee4j.openmq/target/jenkins/partials/permissions.hbs b/instances/ee4j.openmq/target/jenkins/partials/permissions.hbs
index 159c879ac..8a90bdf36 100644
--- a/instances/ee4j.openmq/target/jenkins/partials/permissions.hbs
+++ b/instances/ee4j.openmq/target/jenkins/partials/permissions.hbs
@@ -1,25 +1,23 @@
-- "Overall/Administer:admins"
-- "Job/Read:anonymous"
-- "Overall/Read:anonymous"
-- "Job/ExtendedRead:common"
-- "Agent/Build:ee4j.openmq"
-- "Credentials/View:ee4j.openmq"
-- "Gerrit/ManualTrigger:ee4j.openmq"
-- "Gerrit/Retrigger:ee4j.openmq"
-- "Job/Build:ee4j.openmq"
-- "Job/Cancel:ee4j.openmq"
-- "Job/Configure:ee4j.openmq"
-- "Job/Create:ee4j.openmq"
-- "Job/Delete:ee4j.openmq"
-- "Job/Move:ee4j.openmq"
-- "Job/Read:ee4j.openmq"
-- "Job/Workspace:ee4j.openmq"
-- "Overall/Read:ee4j.openmq"
-- "Run/Delete:ee4j.openmq"
-- "Run/Replay:ee4j.openmq"
-- "Run/Update:ee4j.openmq"
-- "SCM/Tag:ee4j.openmq"
-- "View/Configure:ee4j.openmq"
-- "View/Create:ee4j.openmq"
-- "View/Delete:ee4j.openmq"
-- "View/Read:ee4j.openmq"
+- "GROUP:Overall/Administer:admins"
+- "GROUP:Job/Read:anonymous"
+- "GROUP:Overall/Read:anonymous"
+- "GROUP:Job/ExtendedRead:common"
+- "GROUP:Agent/Build:ee4j.openmq"
+- "GROUP:Credentials/View:ee4j.openmq"
+- "GROUP:Job/Build:ee4j.openmq"
+- "GROUP:Job/Cancel:ee4j.openmq"
+- "GROUP:Job/Configure:ee4j.openmq"
+- "GROUP:Job/Create:ee4j.openmq"
+- "GROUP:Job/Delete:ee4j.openmq"
+- "GROUP:Job/Move:ee4j.openmq"
+- "GROUP:Job/Read:ee4j.openmq"
+- "GROUP:Job/Workspace:ee4j.openmq"
+- "GROUP:Overall/Read:ee4j.openmq"
+- "GROUP:Run/Delete:ee4j.openmq"
+- "GROUP:Run/Replay:ee4j.openmq"
+- "GROUP:Run/Update:ee4j.openmq"
+- "GROUP:SCM/Tag:ee4j.openmq"
+- "GROUP:View/Configure:ee4j.openmq"
+- "GROUP:View/Create:ee4j.openmq"
+- "GROUP:View/Delete:ee4j.openmq"
+- "GROUP:View/Read:ee4j.openmq"
diff --git a/instances/ee4j.openmq/target/jenkins/plugins.log b/instances/ee4j.openmq/target/jenkins/plugins.log
index 3905e1312..35834e22d 100644
--- a/instances/ee4j.openmq/target/jenkins/plugins.log
+++ b/instances/ee4j.openmq/target/jenkins/plugins.log
@@ -1,45 +1,45 @@
 
 Installed plugins:
 ace-editor 1.1
-analysis-model-api 10.6.0
-ant 1.12
-antisamy-markup-formatter 2.4
+analysis-model-api 10.9.1
+ant 1.13
+antisamy-markup-formatter 2.7
 apache-httpcomponents-client-4-api 4.5.13-1.0
 authentication-tokens 1.4
 authorize-project 1.4.0
 bootstrap4-api 4.6.0-3
-bootstrap5-api 5.1.3-1
+bootstrap5-api 5.1.3-4
 bouncycastle-api 2.25
 branch-api 2.7.0
 build-timeout 1.20
 caffeine-api 2.9.2-29.v717aac953ff3
 checks-api 1.7.2
-cloudbees-folder 6.16
+cloudbees-folder 6.17
 command-launcher 1.6
 conditional-buildstep 1.4.1
-config-file-provider 3.8.1
-configuration-as-code 1.54
+config-file-provider 3.8.2
+configuration-as-code 1.55.1
 credentials 2.6.1
-credentials-binding 1.27
-data-tables-api 1.11.3-4
+credentials-binding 1.27.1
+data-tables-api 1.11.3-6
 display-url-api 2.3.5
-durable-task 1.39
-echarts-api 5.2.2-1
-email-ext 2.84
+durable-task 493.v195aefbb0ff2
+echarts-api 5.2.2-2
+email-ext 2.86
 extended-read-permission 3.2
 external-monitor-job 1.7
-extra-columns 1.24
-font-awesome-api 5.15.4-1
-forensics-api 1.6.0
+extra-columns 1.25
+font-awesome-api 5.15.4-5
+forensics-api 1.7.0
 gerrit-trigger 2.35.2
 ghprb 1.42.2
-git 4.10.0
-git-client 3.10.0
-git-parameter 0.9.13
+git 4.10.2
+git-client 3.11.0
+git-parameter 0.9.14
 git-server 1.10
 github 1.34.1
-github-api 1.133
-github-branch-source 2.11.3
+github-api 1.301-378.v9807bd746da5
+github-branch-source 2.11.4
 gitlab-api 1.0.6
 gitlab-branch-source 1.5.9
 gitlab-plugin 1.5.13
@@ -47,128 +47,130 @@ greenballs 1.15.1
 h2-api 1.4.199
 handlebars 3.0.8
 handy-uri-templates-2-api 2.1.8-1.0
-jackson2-api 2.13.0-230.v59243c64b0a5
+jackson2-api 2.13.1-246.va8a9f3eaf46a
 javadoc 1.6
+javax-activation-api 1.2.0-2
+javax-mail-api 1.6.2-5
 jdk-tool 1.5
 jjwt-api 0.11.2-9.c8b45b8bb173
-jobConfigHistory 2.28.1
+jobConfigHistory 2.31-rc1098.b666422863b2
 jquery 1.12.4-1
 jquery3-api 3.6.0-2
 jsch 0.1.55.2
 junit 1.53
-kubernetes 1.30.6
-kubernetes-client-api 5.4.1
+kubernetes 1.31.3
+kubernetes-client-api 5.11.2-182.v0f1cf4c5904e
 kubernetes-credentials 0.9.0
 ldap 2.7
-lockable-resources 2.12
-mailer 1.34
-matrix-auth 2.6.8
-matrix-project 1.19
-maven-plugin 3.15.1
-metrics 4.0.2.8
+lockable-resources 2.13
+mailer 408.vd726a_1130320
+matrix-auth 3.0
+matrix-project 1.20
+maven-plugin 3.16
+metrics 4.0.2.8.1
 momentjs 1.1.1
-okhttp-api 4.9.2-20211102
+okhttp-api 4.9.3-105.vb96869f8ac3a
 pam-auth 1.6.1
-parameterized-trigger 2.41
+parameterized-trigger 2.43
 pipeline-build-step 2.15
-pipeline-graph-analysis 1.11
-pipeline-input-step 2.12
+pipeline-graph-analysis 188.v3a01e7973f2c
+pipeline-input-step 427.va6441fa17010
 pipeline-maven 3.10.0
 pipeline-milestone-step 1.3.2
-pipeline-model-api 1.9.2
-pipeline-model-definition 1.9.2
-pipeline-model-extensions 1.9.2
-pipeline-rest-api 2.19
-pipeline-stage-step 2.5
-pipeline-stage-tags-metadata 1.9.2
-pipeline-stage-view 2.19
+pipeline-model-api 1.9.3
+pipeline-model-definition 1.9.3
+pipeline-model-extensions 1.9.3
+pipeline-rest-api 2.20
+pipeline-stage-step 291.vf0a8a7aeeb50
+pipeline-stage-tags-metadata 1.9.3
+pipeline-stage-view 2.20
 plain-credentials 1.7
-plugin-util-api 2.5.1
+plugin-util-api 2.12.0
 popper-api 1.16.1-2
-popper2-api 2.10.2-1
-promoted-builds 3.10
-rebuild 1.32
-resource-disposer 0.16
+popper2-api 2.11.2-1
+prism-api 1.25.0-1
+promoted-builds 3.11
+rebuild 1.33
+resource-disposer 0.17
 run-condition 1.5
-scm-api 2.6.5
-script-security 1.78
+scm-api 595.vd5a_df5eb_0e39
+script-security 1131.v8b_b_5eda_c328e
 simple-theme-plugin 0.7
 snakeyaml-api 1.29.1
-sonar 2.13.1
-ssh-agent 1.23
+sonar 2.14
+ssh-agent 1.24.1
 ssh-credentials 1.19
 ssh-slaves 1.33.0
 sshd 3.1.0
-structs 1.23
-timestamper 1.13
+structs 308.v852b473a2b8c
+timestamper 1.16
 token-macro 267.vcdaea6462991
 trilead-api 1.0.13
 variant 1.4
-warnings-ng 9.7.0
+warnings-ng 9.10.3
 workflow-aggregator 2.6
-workflow-api 2.47
+workflow-api 1122.v7a_916f363c86
 workflow-basic-steps 2.24
-workflow-cps 2633.v6baeedc13805
-workflow-cps-global-lib 545.v7b28cce323cf
-workflow-durable-task-step 1097.veac1aacfbda8
-workflow-job 2.42
-workflow-multibranch 2.26
+workflow-cps 2648.va9433432b33c
+workflow-cps-global-lib 552.vd9cc05b8a2e1
+workflow-durable-task-step 1112.vda00e6febcc1
+workflow-job 1145.v7f2433caa07f
+workflow-multibranch 706.vd43c65dec013
 workflow-scm-step 2.13
-workflow-step-api 2.24
-workflow-support 3.8
-ws-cleanup 0.39
+workflow-step-api 622.vb_8e7c15b_c95a_
+workflow-support 813.vb_d7c3d2984a_0
+ws-cleanup 0.40
 xvnc 1.28
 
 Bundled plugins:
 
 All requested plugins:
-jacoco 3.3.0
-structs 1.23
+jacoco 3.3.1
 
 Plugins that will be downloaded:
-jacoco 3.3.0
+jacoco 3.3.1
 
 Resulting plugin list:
 ace-editor 1.1
-analysis-model-api 10.6.0
-ant 1.12
-antisamy-markup-formatter 2.4
+analysis-model-api 10.9.1
+ant 1.13
+antisamy-markup-formatter 2.7
 apache-httpcomponents-client-4-api 4.5.13-1.0
 authentication-tokens 1.4
 authorize-project 1.4.0
 bootstrap4-api 4.6.0-3
-bootstrap5-api 5.1.3-1
+bootstrap5-api 5.1.3-4
 bouncycastle-api 2.25
 branch-api 2.7.0
 build-timeout 1.20
 caffeine-api 2.9.2-29.v717aac953ff3
 checks-api 1.7.2
-cloudbees-folder 6.16
+cloudbees-folder 6.17
 command-launcher 1.6
 conditional-buildstep 1.4.1
-config-file-provider 3.8.1
-configuration-as-code 1.54
+config-file-provider 3.8.2
+configuration-as-code 1.55.1
 credentials 2.6.1
-credentials-binding 1.27
-data-tables-api 1.11.3-4
+credentials-binding 1.27.1
+data-tables-api 1.11.3-6
 display-url-api 2.3.5
-durable-task 1.39
-echarts-api 5.2.2-1
-email-ext 2.84
+durable-task 493.v195aefbb0ff2
+echarts-api 5.2.2-2
+email-ext 2.86
 extended-read-permission 3.2
 external-monitor-job 1.7
-extra-columns 1.24
-font-awesome-api 5.15.4-1
-forensics-api 1.6.0
+extra-columns 1.25
+font-awesome-api 5.15.4-5
+forensics-api 1.7.0
 gerrit-trigger 2.35.2
 ghprb 1.42.2
-git 4.10.0
-git-client 3.10.0
-git-parameter 0.9.13
+git 4.10.2
+git-client 3.11.0
+git-parameter 0.9.14
 git-server 1.10
 github 1.34.1
-github-api 1.133
-github-branch-source 2.11.3
+github-api 1.301-378.v9807bd746da5
+github-branch-source 2.11.4
 gitlab-api 1.0.6
 gitlab-branch-source 1.5.9
 gitlab-plugin 1.5.13
@@ -176,77 +178,80 @@ greenballs 1.15.1
 h2-api 1.4.199
 handlebars 3.0.8
 handy-uri-templates-2-api 2.1.8-1.0
-jackson2-api 2.13.0-230.v59243c64b0a5
-jacoco 3.3.0
+jackson2-api 2.13.1-246.va8a9f3eaf46a
+jacoco 3.3.1
 javadoc 1.6
+javax-activation-api 1.2.0-2
+javax-mail-api 1.6.2-5
 jdk-tool 1.5
 jjwt-api 0.11.2-9.c8b45b8bb173
-jobConfigHistory 2.28.1
+jobConfigHistory 2.31-rc1098.b666422863b2
 jquery 1.12.4-1
 jquery3-api 3.6.0-2
 jsch 0.1.55.2
 junit 1.53
-kubernetes 1.30.6
-kubernetes-client-api 5.4.1
+kubernetes 1.31.3
+kubernetes-client-api 5.11.2-182.v0f1cf4c5904e
 kubernetes-credentials 0.9.0
 ldap 2.7
-lockable-resources 2.12
-mailer 1.34
-matrix-auth 2.6.8
-matrix-project 1.19
-maven-plugin 3.15.1
-metrics 4.0.2.8
+lockable-resources 2.13
+mailer 408.vd726a_1130320
+matrix-auth 3.0
+matrix-project 1.20
+maven-plugin 3.16
+metrics 4.0.2.8.1
 momentjs 1.1.1
-okhttp-api 4.9.2-20211102
+okhttp-api 4.9.3-105.vb96869f8ac3a
 pam-auth 1.6.1
-parameterized-trigger 2.41
+parameterized-trigger 2.43
 pipeline-build-step 2.15
-pipeline-graph-analysis 1.11
-pipeline-input-step 2.12
+pipeline-graph-analysis 188.v3a01e7973f2c
+pipeline-input-step 427.va6441fa17010
 pipeline-maven 3.10.0
 pipeline-milestone-step 1.3.2
-pipeline-model-api 1.9.2
-pipeline-model-definition 1.9.2
-pipeline-model-extensions 1.9.2
-pipeline-rest-api 2.19
-pipeline-stage-step 2.5
-pipeline-stage-tags-metadata 1.9.2
-pipeline-stage-view 2.19
+pipeline-model-api 1.9.3
+pipeline-model-definition 1.9.3
+pipeline-model-extensions 1.9.3
+pipeline-rest-api 2.20
+pipeline-stage-step 291.vf0a8a7aeeb50
+pipeline-stage-tags-metadata 1.9.3
+pipeline-stage-view 2.20
 plain-credentials 1.7
-plugin-util-api 2.5.1
+plugin-util-api 2.12.0
 popper-api 1.16.1-2
-popper2-api 2.10.2-1
-promoted-builds 3.10
-rebuild 1.32
-resource-disposer 0.16
+popper2-api 2.11.2-1
+prism-api 1.25.0-1
+promoted-builds 3.11
+rebuild 1.33
+resource-disposer 0.17
 run-condition 1.5
-scm-api 2.6.5
-script-security 1.78
+scm-api 595.vd5a_df5eb_0e39
+script-security 1131.v8b_b_5eda_c328e
 simple-theme-plugin 0.7
 snakeyaml-api 1.29.1
-sonar 2.13.1
-ssh-agent 1.23
+sonar 2.14
+ssh-agent 1.24.1
 ssh-credentials 1.19
 ssh-slaves 1.33.0
 sshd 3.1.0
-structs 1.23
-timestamper 1.13
+structs 308.v852b473a2b8c
+timestamper 1.16
 token-macro 267.vcdaea6462991
 trilead-api 1.0.13
 variant 1.4
-warnings-ng 9.7.0
+warnings-ng 9.10.3
 workflow-aggregator 2.6
-workflow-api 2.47
+workflow-api 1122.v7a_916f363c86
 workflow-basic-steps 2.24
-workflow-cps 2633.v6baeedc13805
-workflow-cps-global-lib 545.v7b28cce323cf
-workflow-durable-task-step 1097.veac1aacfbda8
-workflow-job 2.42
-workflow-multibranch 2.26
+workflow-cps 2648.va9433432b33c
+workflow-cps-global-lib 552.vd9cc05b8a2e1
+workflow-durable-task-step 1112.vda00e6febcc1
+workflow-job 1145.v7f2433caa07f
+workflow-multibranch 706.vd43c65dec013
 workflow-scm-step 2.13
-workflow-step-api 2.24
-workflow-support 3.8
-ws-cleanup 0.39
+workflow-step-api 622.vb_8e7c15b_c95a_
+workflow-support 813.vb_d7c3d2984a_0
+ws-cleanup 0.40
 xvnc 1.28
 
 Security warnings:
diff --git a/instances/ee4j.openmq/target/k8s/configmap-jenkins-config.yml b/instances/ee4j.openmq/target/k8s/configmap-jenkins-config.yml
index 41a5830c8..b8314ac2c 100644
--- a/instances/ee4j.openmq/target/k8s/configmap-jenkins-config.yml
+++ b/instances/ee4j.openmq/target/k8s/configmap-jenkins-config.yml
@@ -44,31 +44,29 @@ data:
       authorizationStrategy:
         projectMatrix:
           permissions:
-            - "Overall/Administer:admins"
-            - "Job/Read:anonymous"
-            - "Overall/Read:anonymous"
-            - "Job/ExtendedRead:common"
-            - "Agent/Build:ee4j.openmq"
-            - "Credentials/View:ee4j.openmq"
-            - "Gerrit/ManualTrigger:ee4j.openmq"
-            - "Gerrit/Retrigger:ee4j.openmq"
-            - "Job/Build:ee4j.openmq"
-            - "Job/Cancel:ee4j.openmq"
-            - "Job/Configure:ee4j.openmq"
-            - "Job/Create:ee4j.openmq"
-            - "Job/Delete:ee4j.openmq"
-            - "Job/Move:ee4j.openmq"
-            - "Job/Read:ee4j.openmq"
-            - "Job/Workspace:ee4j.openmq"
-            - "Overall/Read:ee4j.openmq"
-            - "Run/Delete:ee4j.openmq"
-            - "Run/Replay:ee4j.openmq"
-            - "Run/Update:ee4j.openmq"
-            - "SCM/Tag:ee4j.openmq"
-            - "View/Configure:ee4j.openmq"
-            - "View/Create:ee4j.openmq"
-            - "View/Delete:ee4j.openmq"
-            - "View/Read:ee4j.openmq"
+            - "GROUP:Overall/Administer:admins"
+            - "GROUP:Job/Read:anonymous"
+            - "GROUP:Overall/Read:anonymous"
+            - "GROUP:Job/ExtendedRead:common"
+            - "GROUP:Agent/Build:ee4j.openmq"
+            - "GROUP:Credentials/View:ee4j.openmq"
+            - "GROUP:Job/Build:ee4j.openmq"
+            - "GROUP:Job/Cancel:ee4j.openmq"
+            - "GROUP:Job/Configure:ee4j.openmq"
+            - "GROUP:Job/Create:ee4j.openmq"
+            - "GROUP:Job/Delete:ee4j.openmq"
+            - "GROUP:Job/Move:ee4j.openmq"
+            - "GROUP:Job/Read:ee4j.openmq"
+            - "GROUP:Job/Workspace:ee4j.openmq"
+            - "GROUP:Overall/Read:ee4j.openmq"
+            - "GROUP:Run/Delete:ee4j.openmq"
+            - "GROUP:Run/Replay:ee4j.openmq"
+            - "GROUP:Run/Update:ee4j.openmq"
+            - "GROUP:SCM/Tag:ee4j.openmq"
+            - "GROUP:View/Configure:ee4j.openmq"
+            - "GROUP:View/Create:ee4j.openmq"
+            - "GROUP:View/Delete:ee4j.openmq"
+            - "GROUP:View/Read:ee4j.openmq"
     
       markupFormatter: rawHtml
       crumbIssuer: