diff --git a/jobs/ci-job-validation.yaml b/jobs/ci-job-validation.yaml
index a0d64c8ab..6672ad556 100644
--- a/jobs/ci-job-validation.yaml
+++ b/jobs/ci-job-validation.yaml
@@ -29,7 +29,6 @@
           cron: 'H/5 * * * *'
           white-list-target-branches:
             - ci/centos
-          admin-list:
-            - nixpanic
           org-list:
             - ceph
+          allow-whitelist-orgs-as-admins: true
diff --git a/jobs/commitlint.yaml b/jobs/commitlint.yaml
index 2a65bb900..1bee49172 100644
--- a/jobs/commitlint.yaml
+++ b/jobs/commitlint.yaml
@@ -27,7 +27,11 @@
           status-context: commitlint
           trigger-phrase: '/(re)?test ((all)|(commitlint))'
           # only run on PRs where the trigger-phrase is posted
+          only-trigger-phrase: true
           permit-all: false
           # TODO: set github-hooks to true when it is configured in GitHub
           github-hooks: false
           cron: 'H/5 * * * *'
+          org-list:
+            - ceph
+          allow-whitelist-orgs-as-admins: true
diff --git a/jobs/containerized-tests.yaml b/jobs/containerized-tests.yaml
index d24faa35a..4a94c8790 100644
--- a/jobs/containerized-tests.yaml
+++ b/jobs/containerized-tests.yaml
@@ -29,7 +29,6 @@
           cron: 'H/5 * * * *'
           black-list-target-branches:
             - ci/centos
-          admin-list:
-            - nixpanic
           org-list:
             - ceph
+          allow-whitelist-orgs-as-admins: true
diff --git a/jobs/jjb-validate.yaml b/jobs/jjb-validate.yaml
index bb1fc1007..d932c515f 100644
--- a/jobs/jjb-validate.yaml
+++ b/jobs/jjb-validate.yaml
@@ -43,7 +43,6 @@
           cron: 'H/5 * * * *'
           white-list-target-branches:
             - ci/centos
-          admin-list:
-            - nixpanic
           org-list:
             - ceph
+          allow-whitelist-orgs-as-admins: true
diff --git a/jobs/mini-e2e.yaml b/jobs/mini-e2e.yaml
index 4fe6c9884..05272e6c1 100644
--- a/jobs/mini-e2e.yaml
+++ b/jobs/mini-e2e.yaml
@@ -47,8 +47,6 @@
           cron: 'H/5 * * * *'
           black-list-target-branches:
             - ci/centos
-          admin-list:
-            - nixpanic
           org-list:
             - ceph
 
@@ -91,7 +89,6 @@
           cron: 'H/5 * * * *'
           black-list-target-branches:
             - ci/centos
-          admin-list:
-            - nixpanic
           org-list:
             - ceph
+          allow-whitelist-orgs-as-admins: true