diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index aa1ae0460..97da534af 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -18,7 +18,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: true
+      - name: Rebase to master
+        run: |
+            git config user.name "${{ github.actor }}"
+            git config user.email "${{ github.actor }}@users.noreply.github.com"
+            git pull --rebase origin master
+            git push -f
+      - name: Push rebase changes
+        uses: ad-m/github-push-action@master
+        with:
+          branch: ${{ github.ref_name }}
+          force: true
       - name: Set workflow & branch variables
         id: set-variables
         run: |
@@ -49,9 +61,6 @@ jobs:
       - name: Build Container cleanup
         run: |
             sudo rm -rf release
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: true
       - name: Dump GitHub context
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
@@ -76,12 +85,25 @@ jobs:
         env:
           MATRIX_CONTEXT: ${{ toJson(matrix) }}
         run: echo "$MATRIX_CONTEXT"
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          persist-credentials: true
+      - name: Rebase to master
+        run: |
+            git fetch origin
+            git checkout ${{ github.ref_name }}
+            git reset --hard origin/${{ github.ref_name }}
+            git config user.name "${{ github.actor }}"
+            git config user.email "${{ github.actor }}@users.noreply.github.com"
+            git pull --rebase origin master && git push -f
       - name: Get all changed package files
         id: changed-ruby-files
         uses: tj-actions/changed-files@v45
         with:
           base_sha: master
           files: packages/*.rb
+          since_last_remote_commit: true
       - name: Export variables to github context
         run: |
             # Convert "packages/foo.rb packages/bar.rb" (from steps.changed-ruby-files.outputs.all_changed_files) into "foo bar"
@@ -179,7 +201,9 @@ jobs:
               exit 0
             fi
 
-            git pull && git checkout ${CREW_BRANCH}
+            git fetch origin
+            git checkout ${{ github.ref_name }}
+            git reset --hard origin/${{ github.ref_name }}
             docker pull --platform ${PLATFORM} satmandu/crewbuild:${CONTAINER}
             sudo apt install -y acl
             sudo setfacl -R -m u:1000:rwx .
@@ -214,12 +238,9 @@ jobs:
             git config user.name "${{ github.actor }}"
             git config user.email "${{ github.actor }}@users.noreply.github.com"
             git add -A
-            git commit -m "Add built packages for ${PLATFORM} to ${{ github.ref_name }}"
+            git commit -m "Add built packages for ${PLATFORM} to ${{ github.ref_name }}" && git push -f
+            git log --oneline -10
           fi
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          branch: ${{ github.ref_name }}
   build-check:
     runs-on: ubuntu-24.04
     needs:
@@ -232,32 +253,35 @@ jobs:
         run: exit 1
       - name: Report update & build success
         run: echo "Update & build jobs succeeded. Creating a PR."
-      - name: Rebase to Master
-        run: |
-           git init --ref-format=reftable
-           git remote add origin https://github.com/chromebrew/chromebrew
-           git fetch --all
-           git checkout -f master
-           git config user.name "${{ github.actor }}"
-           git config user.email "${{ github.actor }}@users.noreply.github.com"
-           git pull
-           git checkout ${{ github.ref_name }} && git rebase master
-           # git commit -m "Merge master into ${{ github.ref_name }}." || true
-      - name: Push rebase changes
-        uses: ad-m/github-push-action@master
+      - uses: actions/checkout@v4
         with:
-          branch: ${{ github.ref_name }}
-          force: true
+          fetch-depth: 0
+          persist-credentials: true
+      - name: Rebase to master
+        run: |
+            git config user.name "${{ github.actor }}"
+            git config user.email "${{ github.actor }}@users.noreply.github.com"
+            git fetch origin
+            git reset --hard origin/${{ github.ref_name }}
+            git pull --rebase origin master && git push -f
+            git log --oneline -10
+      - name: Get all changed package files
+        id: changed-ruby-files
+        uses: tj-actions/changed-files@v45
+        with:
+          base_sha: master
+          files: packages/*.rb
+          since_last_remote_commit: true
+      - name: Export variables to github context
+        run: |
+            # Convert "packages/foo.rb packages/bar.rb" (from steps.changed-ruby-files.outputs.all_changed_files) into "foo bar"
+            echo "CHANGED_PACKAGES=$(echo "${{ steps.changed-ruby-files.outputs.all_changed_files }}" | xargs basename -s .rb | xargs)" >> $GITHUB_ENV
       - name: Create Pull Request
         env:
           CREW_BRANCH: ${{ github.ref_name }}
         run: |
-          git config --global user.name 'github-actions[bot]'
-          git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
-          git fetch --shallow-since="1 week"
-          mapfile -t updated_package_array < <( git diff-tree --no-commit-id --name-only -r $(git rev-parse origin/master)..$(git rev-parse --verify HEAD) | grep -v manifest | grep "^packages" | sed -e 's,packages/,,' -e 's,.rb,,')
           echo -e "Updated packages:" > /tmp/pr.txt
-          for file in "${updated_package_array[@]}"
+          for file in ${CHANGED_PACKAGES}
             do
             echo "- ${file}" >> /tmp/pr.txt
           done
diff --git a/.github/workflows/Unit-Test.yml b/.github/workflows/Unit-Test.yml
index 6a73d401f..d2f990a9d 100644
--- a/.github/workflows/Unit-Test.yml
+++ b/.github/workflows/Unit-Test.yml
@@ -10,6 +10,7 @@ on:
       - completed
 jobs:
   container_tests:
+    if: ${{ ( github.repository_owner == 'chromebrew' ) && ( github.ref_name != 'master' ) }}
     strategy:
       matrix:
         arch: [x86_64, armv7l, i686]
diff --git a/manifest/armv7l/e/elfutils.filelist b/manifest/armv7l/e/elfutils.filelist
index 2e9691324..7735d3db5 100644
--- a/manifest/armv7l/e/elfutils.filelist
+++ b/manifest/armv7l/e/elfutils.filelist
@@ -1,5 +1,3 @@
-/usr/local/bin/debuginfod
-/usr/local/bin/debuginfod-find
 /usr/local/bin/eu-addr2line
 /usr/local/bin/eu-ar
 /usr/local/bin/eu-elfclassify
@@ -19,7 +17,6 @@
 /usr/local/bin/eu-strip
 /usr/local/bin/eu-unstrip
 /usr/local/include/dwarf.h
-/usr/local/include/elfutils/debuginfod.h
 /usr/local/include/elfutils/elf-knowledge.h
 /usr/local/include/elfutils/known-dwarf.h
 /usr/local/include/elfutils/libasm.h
@@ -30,22 +27,18 @@
 /usr/local/include/gelf.h
 /usr/local/include/libelf.h
 /usr/local/include/nlist.h
-/usr/local/lib/libasm-0.191.so
+/usr/local/lib/libasm-0.192.so
 /usr/local/lib/libasm.a
 /usr/local/lib/libasm.so
 /usr/local/lib/libasm.so.1
-/usr/local/lib/libdebuginfod-0.191.so
-/usr/local/lib/libdebuginfod.so
-/usr/local/lib/libdebuginfod.so.1
-/usr/local/lib/libdw-0.191.so
+/usr/local/lib/libdw-0.192.so
 /usr/local/lib/libdw.a
 /usr/local/lib/libdw.so
 /usr/local/lib/libdw.so.1
-/usr/local/lib/libelf-0.191.so
+/usr/local/lib/libelf-0.192.so
 /usr/local/lib/libelf.a
 /usr/local/lib/libelf.so
 /usr/local/lib/libelf.so.1
-/usr/local/lib/pkgconfig/libdebuginfod.pc
 /usr/local/lib/pkgconfig/libdw.pc
 /usr/local/lib/pkgconfig/libelf.pc
 /usr/local/share/locale/de/LC_MESSAGES/elfutils.mo
@@ -64,16 +57,45 @@
 /usr/local/share/man/man3/debuginfod_end.3.zst
 /usr/local/share/man/man3/debuginfod_find_debuginfo.3.zst
 /usr/local/share/man/man3/debuginfod_find_executable.3.zst
+/usr/local/share/man/man3/debuginfod_find_metadata.3.zst
 /usr/local/share/man/man3/debuginfod_find_section.3.zst
 /usr/local/share/man/man3/debuginfod_find_source.3.zst
 /usr/local/share/man/man3/debuginfod_get_url.3.zst
 /usr/local/share/man/man3/debuginfod_get_user_data.3.zst
 /usr/local/share/man/man3/debuginfod_set_progressfn.3.zst
 /usr/local/share/man/man3/debuginfod_set_user_data.3.zst
+/usr/local/share/man/man3/elf32_checksum.3.zst
+/usr/local/share/man/man3/elf32_fsize.3.zst
+/usr/local/share/man/man3/elf32_getchdr.3.zst
+/usr/local/share/man/man3/elf32_getehdr.3.zst
+/usr/local/share/man/man3/elf32_getphdr.3.zst
+/usr/local/share/man/man3/elf32_getshdr.3.zst
+/usr/local/share/man/man3/elf32_newehdr.3.zst
+/usr/local/share/man/man3/elf32_newphdr.3.zst
+/usr/local/share/man/man3/elf32_offscn.3.zst
+/usr/local/share/man/man3/elf32_xlatetof.3.zst
+/usr/local/share/man/man3/elf32_xlatetom.3.zst
+/usr/local/share/man/man3/elf64_checksum.3.zst
+/usr/local/share/man/man3/elf64_fsize.3.zst
+/usr/local/share/man/man3/elf64_getchdr.3.zst
+/usr/local/share/man/man3/elf64_getehdr.3.zst
+/usr/local/share/man/man3/elf64_getphdr.3.zst
+/usr/local/share/man/man3/elf64_getshdr.3.zst
+/usr/local/share/man/man3/elf64_newehdr.3.zst
+/usr/local/share/man/man3/elf64_newphdr.3.zst
+/usr/local/share/man/man3/elf64_offscn.3.zst
+/usr/local/share/man/man3/elf64_xlatetof.3.zst
+/usr/local/share/man/man3/elf64_xlatetom.3.zst
 /usr/local/share/man/man3/elf_begin.3.zst
 /usr/local/share/man/man3/elf_clone.3.zst
+/usr/local/share/man/man3/elf_errmsg.3.zst
+/usr/local/share/man/man3/elf_errno.3.zst
 /usr/local/share/man/man3/elf_getdata.3.zst
+/usr/local/share/man/man3/elf_getscn.3.zst
+/usr/local/share/man/man3/elf_ndxscn.3.zst
 /usr/local/share/man/man3/elf_update.3.zst
+/usr/local/share/man/man3/elf_version.3.zst
+/usr/local/share/man/man3/libelf.3.zst
 /usr/local/share/man/man7/debuginfod-client-config.7.zst
 /usr/local/share/man/man8/debuginfod.8.zst
 /usr/local/share/man/man8/debuginfod.service.8.zst
diff --git a/manifest/i686/e/elfutils.filelist b/manifest/i686/e/elfutils.filelist
index ee091d04e..7735d3db5 100644
--- a/manifest/i686/e/elfutils.filelist
+++ b/manifest/i686/e/elfutils.filelist
@@ -27,15 +27,15 @@
 /usr/local/include/gelf.h
 /usr/local/include/libelf.h
 /usr/local/include/nlist.h
-/usr/local/lib/libasm-0.191.so
+/usr/local/lib/libasm-0.192.so
 /usr/local/lib/libasm.a
 /usr/local/lib/libasm.so
 /usr/local/lib/libasm.so.1
-/usr/local/lib/libdw-0.191.so
+/usr/local/lib/libdw-0.192.so
 /usr/local/lib/libdw.a
 /usr/local/lib/libdw.so
 /usr/local/lib/libdw.so.1
-/usr/local/lib/libelf-0.191.so
+/usr/local/lib/libelf-0.192.so
 /usr/local/lib/libelf.a
 /usr/local/lib/libelf.so
 /usr/local/lib/libelf.so.1
@@ -48,10 +48,54 @@
 /usr/local/share/locale/ja/LC_MESSAGES/elfutils.mo
 /usr/local/share/locale/pl/LC_MESSAGES/elfutils.mo
 /usr/local/share/locale/uk/LC_MESSAGES/elfutils.mo
+/usr/local/share/man/man1/debuginfod-find.1.zst
 /usr/local/share/man/man1/eu-elfclassify.1.zst
 /usr/local/share/man/man1/eu-readelf.1.zst
 /usr/local/share/man/man1/eu-srcfiles.1.zst
+/usr/local/share/man/man3/debuginfod_add_http_header.3.zst
+/usr/local/share/man/man3/debuginfod_begin.3.zst
+/usr/local/share/man/man3/debuginfod_end.3.zst
+/usr/local/share/man/man3/debuginfod_find_debuginfo.3.zst
+/usr/local/share/man/man3/debuginfod_find_executable.3.zst
+/usr/local/share/man/man3/debuginfod_find_metadata.3.zst
+/usr/local/share/man/man3/debuginfod_find_section.3.zst
+/usr/local/share/man/man3/debuginfod_find_source.3.zst
+/usr/local/share/man/man3/debuginfod_get_url.3.zst
+/usr/local/share/man/man3/debuginfod_get_user_data.3.zst
+/usr/local/share/man/man3/debuginfod_set_progressfn.3.zst
+/usr/local/share/man/man3/debuginfod_set_user_data.3.zst
+/usr/local/share/man/man3/elf32_checksum.3.zst
+/usr/local/share/man/man3/elf32_fsize.3.zst
+/usr/local/share/man/man3/elf32_getchdr.3.zst
+/usr/local/share/man/man3/elf32_getehdr.3.zst
+/usr/local/share/man/man3/elf32_getphdr.3.zst
+/usr/local/share/man/man3/elf32_getshdr.3.zst
+/usr/local/share/man/man3/elf32_newehdr.3.zst
+/usr/local/share/man/man3/elf32_newphdr.3.zst
+/usr/local/share/man/man3/elf32_offscn.3.zst
+/usr/local/share/man/man3/elf32_xlatetof.3.zst
+/usr/local/share/man/man3/elf32_xlatetom.3.zst
+/usr/local/share/man/man3/elf64_checksum.3.zst
+/usr/local/share/man/man3/elf64_fsize.3.zst
+/usr/local/share/man/man3/elf64_getchdr.3.zst
+/usr/local/share/man/man3/elf64_getehdr.3.zst
+/usr/local/share/man/man3/elf64_getphdr.3.zst
+/usr/local/share/man/man3/elf64_getshdr.3.zst
+/usr/local/share/man/man3/elf64_newehdr.3.zst
+/usr/local/share/man/man3/elf64_newphdr.3.zst
+/usr/local/share/man/man3/elf64_offscn.3.zst
+/usr/local/share/man/man3/elf64_xlatetof.3.zst
+/usr/local/share/man/man3/elf64_xlatetom.3.zst
 /usr/local/share/man/man3/elf_begin.3.zst
 /usr/local/share/man/man3/elf_clone.3.zst
+/usr/local/share/man/man3/elf_errmsg.3.zst
+/usr/local/share/man/man3/elf_errno.3.zst
 /usr/local/share/man/man3/elf_getdata.3.zst
+/usr/local/share/man/man3/elf_getscn.3.zst
+/usr/local/share/man/man3/elf_ndxscn.3.zst
 /usr/local/share/man/man3/elf_update.3.zst
+/usr/local/share/man/man3/elf_version.3.zst
+/usr/local/share/man/man3/libelf.3.zst
+/usr/local/share/man/man7/debuginfod-client-config.7.zst
+/usr/local/share/man/man8/debuginfod.8.zst
+/usr/local/share/man/man8/debuginfod.service.8.zst
diff --git a/manifest/x86_64/e/elfutils.filelist b/manifest/x86_64/e/elfutils.filelist
index 9a0edfbb2..9fc463d91 100644
--- a/manifest/x86_64/e/elfutils.filelist
+++ b/manifest/x86_64/e/elfutils.filelist
@@ -1,5 +1,3 @@
-/usr/local/bin/debuginfod
-/usr/local/bin/debuginfod-find
 /usr/local/bin/eu-addr2line
 /usr/local/bin/eu-ar
 /usr/local/bin/eu-elfclassify
@@ -19,7 +17,6 @@
 /usr/local/bin/eu-strip
 /usr/local/bin/eu-unstrip
 /usr/local/include/dwarf.h
-/usr/local/include/elfutils/debuginfod.h
 /usr/local/include/elfutils/elf-knowledge.h
 /usr/local/include/elfutils/known-dwarf.h
 /usr/local/include/elfutils/libasm.h
@@ -30,22 +27,18 @@
 /usr/local/include/gelf.h
 /usr/local/include/libelf.h
 /usr/local/include/nlist.h
-/usr/local/lib64/libasm-0.191.so
+/usr/local/lib64/libasm-0.192.so
 /usr/local/lib64/libasm.a
 /usr/local/lib64/libasm.so
 /usr/local/lib64/libasm.so.1
-/usr/local/lib64/libdebuginfod-0.191.so
-/usr/local/lib64/libdebuginfod.so
-/usr/local/lib64/libdebuginfod.so.1
-/usr/local/lib64/libdw-0.191.so
+/usr/local/lib64/libdw-0.192.so
 /usr/local/lib64/libdw.a
 /usr/local/lib64/libdw.so
 /usr/local/lib64/libdw.so.1
-/usr/local/lib64/libelf-0.191.so
+/usr/local/lib64/libelf-0.192.so
 /usr/local/lib64/libelf.a
 /usr/local/lib64/libelf.so
 /usr/local/lib64/libelf.so.1
-/usr/local/lib64/pkgconfig/libdebuginfod.pc
 /usr/local/lib64/pkgconfig/libdw.pc
 /usr/local/lib64/pkgconfig/libelf.pc
 /usr/local/share/locale/de/LC_MESSAGES/elfutils.mo
@@ -64,16 +57,45 @@
 /usr/local/share/man/man3/debuginfod_end.3.zst
 /usr/local/share/man/man3/debuginfod_find_debuginfo.3.zst
 /usr/local/share/man/man3/debuginfod_find_executable.3.zst
+/usr/local/share/man/man3/debuginfod_find_metadata.3.zst
 /usr/local/share/man/man3/debuginfod_find_section.3.zst
 /usr/local/share/man/man3/debuginfod_find_source.3.zst
 /usr/local/share/man/man3/debuginfod_get_url.3.zst
 /usr/local/share/man/man3/debuginfod_get_user_data.3.zst
 /usr/local/share/man/man3/debuginfod_set_progressfn.3.zst
 /usr/local/share/man/man3/debuginfod_set_user_data.3.zst
+/usr/local/share/man/man3/elf32_checksum.3.zst
+/usr/local/share/man/man3/elf32_fsize.3.zst
+/usr/local/share/man/man3/elf32_getchdr.3.zst
+/usr/local/share/man/man3/elf32_getehdr.3.zst
+/usr/local/share/man/man3/elf32_getphdr.3.zst
+/usr/local/share/man/man3/elf32_getshdr.3.zst
+/usr/local/share/man/man3/elf32_newehdr.3.zst
+/usr/local/share/man/man3/elf32_newphdr.3.zst
+/usr/local/share/man/man3/elf32_offscn.3.zst
+/usr/local/share/man/man3/elf32_xlatetof.3.zst
+/usr/local/share/man/man3/elf32_xlatetom.3.zst
+/usr/local/share/man/man3/elf64_checksum.3.zst
+/usr/local/share/man/man3/elf64_fsize.3.zst
+/usr/local/share/man/man3/elf64_getchdr.3.zst
+/usr/local/share/man/man3/elf64_getehdr.3.zst
+/usr/local/share/man/man3/elf64_getphdr.3.zst
+/usr/local/share/man/man3/elf64_getshdr.3.zst
+/usr/local/share/man/man3/elf64_newehdr.3.zst
+/usr/local/share/man/man3/elf64_newphdr.3.zst
+/usr/local/share/man/man3/elf64_offscn.3.zst
+/usr/local/share/man/man3/elf64_xlatetof.3.zst
+/usr/local/share/man/man3/elf64_xlatetom.3.zst
 /usr/local/share/man/man3/elf_begin.3.zst
 /usr/local/share/man/man3/elf_clone.3.zst
+/usr/local/share/man/man3/elf_errmsg.3.zst
+/usr/local/share/man/man3/elf_errno.3.zst
 /usr/local/share/man/man3/elf_getdata.3.zst
+/usr/local/share/man/man3/elf_getscn.3.zst
+/usr/local/share/man/man3/elf_ndxscn.3.zst
 /usr/local/share/man/man3/elf_update.3.zst
+/usr/local/share/man/man3/elf_version.3.zst
+/usr/local/share/man/man3/libelf.3.zst
 /usr/local/share/man/man7/debuginfod-client-config.7.zst
 /usr/local/share/man/man8/debuginfod.8.zst
 /usr/local/share/man/man8/debuginfod.service.8.zst
diff --git a/packages/elfutils.rb b/packages/elfutils.rb
index a4779b546..2b81deb48 100644
--- a/packages/elfutils.rb
+++ b/packages/elfutils.rb
@@ -3,7 +3,7 @@ require 'buildsystems/autotools'
 class Elfutils < Autotools
   description 'elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.'
   homepage 'https://sourceware.org/elfutils/'
-  version '0.191'
+  version '0.192'
   license 'GPL-2+ or LGPL-3+'
   compatibility 'all'
   source_url 'https://sourceware.org/git/elfutils.git'
@@ -11,10 +11,10 @@ class Elfutils < Autotools
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: '818e00b257bc8aecc944da511ca0ce159d5d9836be118a813078a9ceff58bd1b',
-     armv7l: '818e00b257bc8aecc944da511ca0ce159d5d9836be118a813078a9ceff58bd1b',
-       i686: '1e5061a8f1448225d91546f5428fdf9e5d01966074512e16cce3fd6f3214046a',
-     x86_64: '5090210bdc4f451e69c994b9d6e5a23241f4cce6a38870a27f0cc66c82fe8213'
+    aarch64: 'abf24a50af269b1c68cdd5a744ae76c36a064668d28baa5bad3b3d5f69af5a48',
+     armv7l: 'abf24a50af269b1c68cdd5a744ae76c36a064668d28baa5bad3b3d5f69af5a48',
+       i686: '11df8c8616d54f2a78bd1eee6d468ffc9cf87269aaa853fa628b1bd7e5254be6',
+     x86_64: '7ae043365539b0b193166b1695cebc49de05d6841f6e8787430826034eb0fb19'
   })
 
   depends_on 'bzip2' # R
@@ -28,10 +28,16 @@ class Elfutils < Autotools
   depends_on 'zlib' # R
   depends_on 'zstd' # R
 
-  pre_configure_options "CFLAGS+=' -Wno-error ' CXXFLAGS+=' -Wno-error '"
+  # -D_FORTIFY_SOURCE=0 needed due to -O3 optimization.
+  pre_configure_options "CFLAGS+=' -Wno-error -D_FORTIFY_SOURCE=0' CXXFLAGS+=' -Wno-error -D_FORTIFY_SOURCE=0'"
   configure_options "#{ARCH == 'i686' ? '--disable-libdebuginfod --disable-debuginfod' : ''} --enable-maintainer-mode --program-prefix='eu-'"
 
   def self.patch
+    downloader 'https://raw.githubusercontent.com/openwrt/openwrt/refs/heads/main/package/libs/elfutils/patches/009-fix-null-dereference-with-lto.patch', 'bd81d483ed5474fd7e87a27e4c961bf8670f76c45f5fe9a273cb2f11d8f44ffc'
+    system 'patch -Np1 -i 009-fix-null-dereference-with-lto.patch'
+    downloader 'https://raw.githubusercontent.com/openwrt/openwrt/refs/heads/main/package/libs/elfutils/patches/102-fix-potential-deref-of-null-error.patch', '4be7368570bf64d38d34ae8147946e0d3741103e3b4dd0000d4e5c228d16e352'
+    system 'patch -Np1 -i 102-fix-potential-deref-of-null-error.patch'
+
     return unless ARCH == 'i686'
 
     # https://sourceware.org/git/?p=glibc.git;a=commit;h=0be74c5c7cb239e4884d1ee0fd48c746a0bd1a65
diff --git a/tools/build_updated_packages.rb b/tools/build_updated_packages.rb
index a6a825287..fc520d5fa 100755
--- a/tools/build_updated_packages.rb
+++ b/tools/build_updated_packages.rb
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# build_updated_packages version 2.1 (for Chromebrew)
+# build_updated_packages version 2.2 (for Chromebrew)
 # This updates the versions in python pip packages by calling
 # tools/update_python_pip_packages.rb, checks for updated ruby packages
 # by calling tools/update_ruby_gem_packages.rb, and then checks if any
@@ -129,7 +129,7 @@ updated_packages.each do |pkg|
       next
     else
       puts "#{name.capitalize} #{@pkg_obj.version} needs builds uploaded for: #{builds_needed.join(' ')}".lightblue
-      system "yes | crew build -f #{pkg}" if builds_needed.include?(ARCH) && !File.file?("release/#{ARCH}/#{name}-#{@pkg_obj.version}-chromeos-#{ARCH}.#{@pkg_obj.binary_compression}") && agree_default_yes("\nWould you like to build #{name} #{@pkg_obj.version}")
+      (system "yes | crew build -f #{pkg}" || abort("#{pkg} build failed!")) if builds_needed.include?(ARCH) && !File.file?("release/#{ARCH}/#{name}-#{@pkg_obj.version}-chromeos-#{ARCH}.#{@pkg_obj.binary_compression}") && agree_default_yes("\nWould you like to build #{name} #{@pkg_obj.version}")
       upload_pkg = nil
       builds_needed.each do |build|
         upload_pkg = true if File.file?("release/#{build}/#{name}-#{@pkg_obj.version}-chromeos-#{build}.#{@pkg_obj.binary_compression}")
diff --git a/tools/github_actions_update_builder.sh b/tools/github_actions_update_builder.sh
index e249d69c6..90f1d0302 100755
--- a/tools/github_actions_update_builder.sh
+++ b/tools/github_actions_update_builder.sh
@@ -2,8 +2,8 @@
 # Mapping of /output should be set in the docker run options for the
 # run-updater step of the generate job in .github/workflows/Updater.yml
 cd /output/ || exit 1
+crew update
 git config --global --add safe.directory /output
 export CREW_AGREE_TIMEOUT_SECONDS=1
 set -x
-tools/build_updated_packages.rb --skip
-echo "Exit code of build run was: $?"
+tools/build_updated_packages.rb --skip || exit 1