diff --git a/.github/codeowners b/.github/codeowners
index ff84a97a6..19d037710 100644
--- a/.github/codeowners
+++ b/.github/codeowners
@@ -1,7 +1,7 @@
 # Matched against repo root (asterisk)
-*       @RMCampos @mgaseta @Ding-x @DerekRoberts @SLDonnelly
+*       @xiaopeng0202 @mgaseta @DerekRoberts @SLDonnelly
 
 # Matched against directories
-/sync/      @ronrobb
+/sync/      @franTarkenton
 
 # See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 7f7010d40..3c1e74f25 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -60,7 +60,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run Trivy vulnerability scanner in repo mode
-        uses: aquasecurity/trivy-action@0.26.0
+        uses: aquasecurity/trivy-action@0.27.0
         with:
           format: "sarif"
           output: "trivy-results.sarif"
diff --git a/.github/workflows/etl-prod.yml b/.github/workflows/etl-prod.yml
new file mode 100644
index 000000000..6685d8f31
--- /dev/null
+++ b/.github/workflows/etl-prod.yml
@@ -0,0 +1,22 @@
+name: ETL PROD
+
+on:
+  schedule: [cron: "30 */2 * * *"] # Every other hour on the hour
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
+
+jobs:
+  etl-prod:
+    environment: prod
+    name: ETL (PROD)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4"
+      - name: Run ./sync/oc_run.sh
+        run: ./sync/oc_run.sh prod ${{ secrets.oc_token }}
diff --git a/.github/workflows/job-sync.yml b/.github/workflows/etl-test.yml
similarity index 52%
rename from .github/workflows/job-sync.yml
rename to .github/workflows/etl-test.yml
index 5a35d448e..2de83e655 100644
--- a/.github/workflows/job-sync.yml
+++ b/.github/workflows/etl-test.yml
@@ -1,4 +1,4 @@
-name: ETL Sync
+name: ETL TEST
 
 on:
   schedule: [cron: "0 */2 * * *"] # Every other hour on the hour
@@ -9,26 +9,14 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  sync-test:
+  etl-test:
     environment: test
-    name: Sync (TEST)
+    name: ETL (TEST)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4"
-      - name: ETL (TEST)
+      - name: Run ./sync/oc_run.sh
         run: ./sync/oc_run.sh test ${{ secrets.oc_token }}
-
-  sync-prod:
-    environment: prod
-    name: Sync (PROD)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: redhat-actions/openshift-tools-installer@v1
-        with:
-          oc: "4"
-      - name: ETL (PROD)
-        run: ./sync/oc_run.sh prod ${{ secrets.oc_token }}