diff --git a/.github/workflows/Generate-PR.yml b/.github/workflows/Generate-PR.yml
index 7daa6394c..63210437f 100644
--- a/.github/workflows/Generate-PR.yml
+++ b/.github/workflows/Generate-PR.yml
@@ -443,5 +443,5 @@ jobs:
           echo "PR_NUMBER is ${PR_NUMBER}"
           echo "PR_NUMBER=${PR_NUMBER}" >> "$GITHUB_ENV"
           # Trigger workflow runs:
-          gh workflow run Unit-Test.yml -R ${{ github.repository }} -r ${{ inputs.branch || github.ref_name }}
-          gh workflow run Linter-Handoff.yml -R ${{ github.repository }} -r ${{ inputs.branch || github.ref_name }}
+          # gh workflow run Unit-Test.yml -R ${{ github.repository }} -r ${{ inputs.branch || github.ref_name }}
+          # gh workflow run Linter-Handoff.yml -R ${{ github.repository }} -r ${{ inputs.branch || github.ref_name }}
diff --git a/.github/workflows/Linter-Handoff.yml b/.github/workflows/Linter-Handoff.yml
index 90927b265..8af9f02f8 100644
--- a/.github/workflows/Linter-Handoff.yml
+++ b/.github/workflows/Linter-Handoff.yml
@@ -9,6 +9,10 @@ on:
       - synchronize
   merge_group:
   workflow_dispatch:
+  workflow_run:
+    workflows: [Generate PR]
+    types:
+      - completed
 env:
   GH_TOKEN: ${{ secrets.CREW_PR_TOKEN }}
 jobs:
diff --git a/.github/workflows/Unit-Test.yml b/.github/workflows/Unit-Test.yml
index b8879cc4b..ab0fe0fc4 100644
--- a/.github/workflows/Unit-Test.yml
+++ b/.github/workflows/Unit-Test.yml
@@ -12,10 +12,10 @@ on:
       - reopened
       - synchronize
   workflow_dispatch:
-  # workflow_run:
-  #  workflows: [Build]
-  #  types:
-  #    - completed
+  workflow_run:
+    workflows: [Generate PR]
+    types:
+      - completed
 jobs:
   container_tests:
     if: ${{ github.repository_owner == 'chromebrew' }}
diff --git a/manifest/armv7l/j/jq.filelist b/manifest/armv7l/j/jq.filelist
index 2517f4eb9..d0077a7ac 100644
--- a/manifest/armv7l/j/jq.filelist
+++ b/manifest/armv7l/j/jq.filelist
@@ -1,22 +1,13 @@
-# Total size: 8030958
+# Total size: 2568376
 /usr/local/bin/jq
-/usr/local/bin/onig-config
 /usr/local/include/jq.h
 /usr/local/include/jv.h
-/usr/local/include/oniggnu.h
-/usr/local/include/oniguruma.h
 /usr/local/lib/libjq.a
 /usr/local/lib/libjq.la
 /usr/local/lib/libjq.so
 /usr/local/lib/libjq.so.1
 /usr/local/lib/libjq.so.1.0.4
-/usr/local/lib/libonig.a
-/usr/local/lib/libonig.la
-/usr/local/lib/libonig.so
-/usr/local/lib/libonig.so.5
-/usr/local/lib/libonig.so.5.5.0
 /usr/local/lib/pkgconfig/libjq.pc
-/usr/local/lib/pkgconfig/oniguruma.pc
 /usr/local/share/doc/jq/AUTHORS
 /usr/local/share/doc/jq/COPYING
 /usr/local/share/doc/jq/NEWS.md
diff --git a/manifest/armv7l/o/oniguruma.filelist b/manifest/armv7l/o/oniguruma.filelist
index 465e75b24..0c696db3d 100644
--- a/manifest/armv7l/o/oniguruma.filelist
+++ b/manifest/armv7l/o/oniguruma.filelist
@@ -1,4 +1,4 @@
-# Total size: 3464159
+# Total size: 3598459
 /usr/local/bin/onig-config
 /usr/local/include/oniggnu.h
 /usr/local/include/oniguruma.h
diff --git a/manifest/i686/j/jq.filelist b/manifest/i686/j/jq.filelist
index e6202f705..7c7c3b3c7 100644
--- a/manifest/i686/j/jq.filelist
+++ b/manifest/i686/j/jq.filelist
@@ -1,8 +1,7 @@
-# Total size: 5108617
+# Total size: 726851
 /usr/local/bin/jq
 /usr/local/include/jq.h
 /usr/local/include/jv.h
-/usr/local/lib/libjq.a
 /usr/local/lib/libjq.la
 /usr/local/lib/libjq.so
 /usr/local/lib/libjq.so.1
diff --git a/manifest/i686/o/oniguruma.filelist b/manifest/i686/o/oniguruma.filelist
index bd71f11e0..3be1c8c60 100644
--- a/manifest/i686/o/oniguruma.filelist
+++ b/manifest/i686/o/oniguruma.filelist
@@ -1,4 +1,4 @@
-# Total size: 3704639
+# Total size: 3714063
 /usr/local/bin/onig-config
 /usr/local/include/oniggnu.h
 /usr/local/include/oniguruma.h
diff --git a/manifest/x86_64/j/jq.filelist b/manifest/x86_64/j/jq.filelist
index 080f1307e..810a9b75e 100644
--- a/manifest/x86_64/j/jq.filelist
+++ b/manifest/x86_64/j/jq.filelist
@@ -1,22 +1,13 @@
-# Total size: 9588190
+# Total size: 5726450
 /usr/local/bin/jq
-/usr/local/bin/onig-config
 /usr/local/include/jq.h
 /usr/local/include/jv.h
-/usr/local/include/oniggnu.h
-/usr/local/include/oniguruma.h
 /usr/local/lib64/libjq.a
 /usr/local/lib64/libjq.la
 /usr/local/lib64/libjq.so
 /usr/local/lib64/libjq.so.1
 /usr/local/lib64/libjq.so.1.0.4
-/usr/local/lib64/libonig.a
-/usr/local/lib64/libonig.la
-/usr/local/lib64/libonig.so
-/usr/local/lib64/libonig.so.5
-/usr/local/lib64/libonig.so.5.5.0
 /usr/local/lib64/pkgconfig/libjq.pc
-/usr/local/lib64/pkgconfig/oniguruma.pc
 /usr/local/share/doc/jq/AUTHORS
 /usr/local/share/doc/jq/COPYING
 /usr/local/share/doc/jq/NEWS.md
diff --git a/manifest/x86_64/o/oniguruma.filelist b/manifest/x86_64/o/oniguruma.filelist
index 4bd9fefd0..d3fea8996 100644
--- a/manifest/x86_64/o/oniguruma.filelist
+++ b/manifest/x86_64/o/oniguruma.filelist
@@ -1,4 +1,4 @@
-# Total size: 3856489
+# Total size: 3869713
 /usr/local/bin/onig-config
 /usr/local/include/oniggnu.h
 /usr/local/include/oniguruma.h
diff --git a/packages/jq.rb b/packages/jq.rb
index d5d3825db..65ab42fb8 100644
--- a/packages/jq.rb
+++ b/packages/jq.rb
@@ -3,7 +3,7 @@ require 'buildsystems/autotools'
 class Jq < Autotools
   description 'jq is a lightweight and flexible command-line JSON processor.'
   homepage 'https://stedolan.github.io/jq/'
-  version '1.8.0'
+  version '1.8.1'
   license 'MIT and CC-BY-3.0'
   compatibility 'all'
   source_url 'https://github.com/stedolan/jq.git'
@@ -11,15 +11,16 @@ class Jq < Autotools
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'e9cb268eb4ecd0f60e630b6f9803ac98786bdcd3abd03f4b4491daea0d1b9e1e',
-     armv7l: 'e9cb268eb4ecd0f60e630b6f9803ac98786bdcd3abd03f4b4491daea0d1b9e1e',
-       i686: 'd3f0160e353fa8abb5f05a67706f7c6ba98897e03db42ffffcde5b90920d7160',
-     x86_64: 'bcb53c60671bf683e358d4ed1eb1d65ac892a157070278844e0627944b205877'
+    aarch64: '9b43ad5b36f03354c8617508dba0b1cb0e22c917502a65e562ec57b08f63e5ea',
+     armv7l: '9b43ad5b36f03354c8617508dba0b1cb0e22c917502a65e562ec57b08f63e5ea',
+       i686: '3890e4b752480f64c8a424801ab6069b4c78db456bdeb1d42ea97bc930e260da',
+     x86_64: '1c10b89e6e12e52466f1b4dabe999ba9d705c54bddc2b3258e13898103f83826'
   })
 
-  depends_on 'glibc'
+  depends_on 'glibc' # R
+  depends_on 'oniguruma' # R
 
-  autotools_configure_options '--disable-maintainer-mode \
+  autotools_configure_options "--disable-maintainer-mode \
       --disable-docs \
-      --enable-all-static'
+      --enable-static#{'=no' if ARCH == 'i686'}"
 end
diff --git a/packages/oniguruma.rb b/packages/oniguruma.rb
index b598d1817..78d49c277 100644
--- a/packages/oniguruma.rb
+++ b/packages/oniguruma.rb
@@ -3,18 +3,18 @@ require 'buildsystems/autotools'
 class Oniguruma < Autotools
   description 'Oniguruma is a modern and flexible regular expressions library.'
   homepage 'https://github.com/kkos/oniguruma'
-  version '6.9.10'
+  version '6.9.10-1'
   license 'BSD-2'
   compatibility 'all'
   source_url 'https://github.com/kkos/oniguruma.git'
-  git_hashtag "v#{version}"
+  git_hashtag "v#{version.split('-').first}"
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'd820f709ae1c955a7ae80597437018135bcb3b82961e68db0eaf4beac179af41',
-     armv7l: 'd820f709ae1c955a7ae80597437018135bcb3b82961e68db0eaf4beac179af41',
-       i686: '4883e73f1a92dd62fe0545ebd549336f0a39e62c40075b121a7af236187e929d',
-     x86_64: 'ef8c2624470d4bc6bd395ace5b1628a857e03ac6edbf10ff6631d92216a45055'
+    aarch64: '8852687c97e14224dcb9109d4a9a23e19cc6cd57c5a82c00e1b2765d8d81b4d5',
+     armv7l: '8852687c97e14224dcb9109d4a9a23e19cc6cd57c5a82c00e1b2765d8d81b4d5',
+       i686: '56cf9e186fb10f092884545430370de1bd355facd601723502a1b97a29b3d003',
+     x86_64: '59f7cf8d137cb10eb3dff51744cea72ee5575ea05c58f4c9d65fa073781ad95d'
   })
 
   depends_on 'glibc' # R