diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 82517c939346..5353c09043b5 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -241,4 +241,18 @@ aliases:
     - saschagrunert # subproject owner / Release Manager / SIG Chair
     - tpepper # subproject owner
     - xmudrii # Release Manager
+  # business hours oncall for prow etc (https://go.k8s.io/oncall)
+  test-infra-oncall:
+    - chaodaiG
+    - chases2
+    - cjwagner
+    - e-blackwelder
+    - fejta
+    - michelle192837
+  # people with sufficient privileges to run scripts in /infra/gcp
+  wg-k8s-infra-org-admins:
+    - cblecker
+    - dims
+    - spiffxp
+    - thockin
 ## END CUSTOM CONTENT
diff --git a/groups/groups.yaml b/groups/groups.yaml
index 57cb259cda07..ec9878172ecc 100644
--- a/groups/groups.yaml
+++ b/groups/groups.yaml
@@ -651,17 +651,20 @@ groups:
     members:
       # test-infra-oncall
       - amerai@google.com
-      - bentheelder@google.com
-      - clarketm@google.com
+      - chaodai@google.com
       - colew@google.com
       - eblackwelder@google.com
       - fejta@google.com
       - slchase@google.com
-      # wg-k8s-infra-oncall
+      # sig-testing leads
+      - bentheelder@google.com
+      - skuznets@redhat.com
+      - spiffxp@google.com
+      - spiffxp@gmail.com
+      # wg-k8s-infra members
       - ameukam@gmail.com
       - cblecker@gmail.com
       - davanum@gmail.com
-      - spiffxp@google.com
       - thockin@google.com
 
   - email-id: k8s-infra-prow-viewers@kubernetes.io
@@ -691,14 +694,7 @@ groups:
       - thejoycekung@gmail.com
       - neolit123@gmail.com
       - philjohnson96@gmail.com
-      # sig-scalability
-      - jeedigv@amazon.com
-      - jkaniuk@google.com
-      - jprzychodzen@google.com
-      - maciejborsz@google.com
-      - mmatejczyk@google.com
-      - wojtekt@google.com
-      - zawodny@google.com
+      - k8s-infra-sig-scalability-oncall@kubernetes.io
 
   - email-id: k8s-infra-sig-scalability-oncall@kubernetes.io
     name: k8s-infra-sig-scalability-oncall
diff --git a/infra/gcp/clusters/projects/k8s-infra-prow-build-trusted/OWNERS b/infra/gcp/clusters/projects/k8s-infra-prow-build-trusted/OWNERS
new file mode 100644
index 000000000000..8aca488acc06
--- /dev/null
+++ b/infra/gcp/clusters/projects/k8s-infra-prow-build-trusted/OWNERS
@@ -0,0 +1,13 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+reviewers:
+- sig-testing-leads
+- release-engineering-reviewers
+- test-infra-oncall
+approvers:
+- sig-testing-leads
+- ameukam
+
+labels:
+- area/prow
+- sig/testing
diff --git a/infra/gcp/clusters/projects/k8s-infra-prow-build/OWNERS b/infra/gcp/clusters/projects/k8s-infra-prow-build/OWNERS
new file mode 100644
index 000000000000..8aca488acc06
--- /dev/null
+++ b/infra/gcp/clusters/projects/k8s-infra-prow-build/OWNERS
@@ -0,0 +1,13 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+reviewers:
+- sig-testing-leads
+- release-engineering-reviewers
+- test-infra-oncall
+approvers:
+- sig-testing-leads
+- ameukam
+
+labels:
+- area/prow
+- sig/testing
diff --git a/infra/gcp/prow/OWNERS b/infra/gcp/prow/OWNERS
new file mode 100644
index 000000000000..8aca488acc06
--- /dev/null
+++ b/infra/gcp/prow/OWNERS
@@ -0,0 +1,13 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+reviewers:
+- sig-testing-leads
+- release-engineering-reviewers
+- test-infra-oncall
+approvers:
+- sig-testing-leads
+- ameukam
+
+labels:
+- area/prow
+- sig/testing
diff --git a/infra/gcp/ensure-e2e-projects.sh b/infra/gcp/prow/ensure-e2e-projects.sh
similarity index 100%
rename from infra/gcp/ensure-e2e-projects.sh
rename to infra/gcp/prow/ensure-e2e-projects.sh