diff --git a/efs-utils.yaml b/efs-utils.yaml
index caeaf94af77..7586b7266ab 100644
--- a/efs-utils.yaml
+++ b/efs-utils.yaml
@@ -1,7 +1,7 @@
 package:
   name: efs-utils
-  version: "2.3.1"
-  epoch: 2
+  version: "2.3.2"
+  epoch: 0
   description: Utilities for Amazon Elastic File System (EFS)
   copyright:
     - license: MIT
@@ -39,7 +39,7 @@ pipeline:
     with:
       repository: https://github.com/aws/efs-utils
       tag: v${{package.version}}
-      expected-commit: 48cd437bc5212809b1ad546293b3c2931ea79caf
+      expected-commit: e9ff0e1596f8ac566063659cda60290339216727
 
   - uses: patch
     with:
@@ -103,49 +103,50 @@ subpackages:
         - util-linux
         - wolfi-baselayout
     pipeline:
-      - uses: git-checkout
-        with:
-          repository: https://github.com/aws/efs-utils
-          tag: v${{package.version}}
-          expected-commit: 48cd437bc5212809b1ad546293b3c2931ea79caf
-      - uses: patch
-        with:
-          patches: GHSA-857q-xmph-p2v5.patch
       - runs: |
-          # This looks a little funny, but it aims to be easier to maintain, so we just
-          # copy from the upstream `build-deb.sh` script the bits we need.
-          # Ref: https://github.com/aws/efs-utils/blob/master/build-deb.sh
-          cd src/proxy
-          cargo auditable build --release
-          cd ..
-          cd ..
-          export BUILD_ROOT="${{targets.contextdir}}"
-          mkdir -p ${BUILD_ROOT}
+          # First git-checkout pipeline tests the commit already so we can skip it here as the
+          # bot doesn't update the commit hash in the subpackages, leads build failures.
+          git clone --branch v${{package.version}} --depth 1 https://github.com/aws/efs-utils.git
+      - working-directory: efs-utils
+        pipeline:
+          - uses: patch
+            with:
+              patches: ../GHSA-857q-xmph-p2v5.patch
+          - runs: |
+              # This looks a little funny, but it aims to be easier to maintain, so we just
+              # copy from the upstream `build-deb.sh` script the bits we need.
+              # Ref: https://github.com/aws/efs-utils/blob/master/build-deb.sh
+              cd src/proxy
+              cargo auditable build --release
+              cd ..
+              cd ..
+              export BUILD_ROOT="${{targets.contextdir}}"
+              mkdir -p ${BUILD_ROOT}
 
-          echo 'Creating application directories'
-          mkdir -p ${BUILD_ROOT}/etc/amazon/efs
-          mkdir -p ${BUILD_ROOT}/etc/init/
-          mkdir -p ${BUILD_ROOT}/etc/systemd/system
-          mkdir -p ${BUILD_ROOT}/usr/bin
-          mkdir -p ${BUILD_ROOT}/var/log/amazon/efs
-          mkdir -p ${BUILD_ROOT}/usr/share/man/man8
+              echo 'Creating application directories'
+              mkdir -p ${BUILD_ROOT}/etc/amazon/efs
+              mkdir -p ${BUILD_ROOT}/etc/init/
+              mkdir -p ${BUILD_ROOT}/etc/systemd/system
+              mkdir -p ${BUILD_ROOT}/usr/bin
+              mkdir -p ${BUILD_ROOT}/var/log/amazon/efs
+              mkdir -p ${BUILD_ROOT}/usr/share/man/man8
 
-          echo 'Copying application files'
-          install -p -m 644 dist/amazon-efs-mount-watchdog.conf ${BUILD_ROOT}/etc/init
-          install -p -m 644 dist/amazon-efs-mount-watchdog.service ${BUILD_ROOT}/etc/systemd/system
-          install -p -m 444 dist/efs-utils.crt ${BUILD_ROOT}/etc/amazon/efs
-          install -p -m 644 dist/efs-utils.conf ${BUILD_ROOT}/etc/amazon/efs
-          install -p -m 755 src/mount_efs/__init__.py ${BUILD_ROOT}/usr/bin/mount.efs
-          install -p -m 755 src/proxy/target/release/efs-proxy ${BUILD_ROOT}/usr/bin/efs-proxy
-          install -p -m 755 src/watchdog/__init__.py ${BUILD_ROOT}/usr/bin/amazon-efs-mount-watchdog
+              echo 'Copying application files'
+              install -p -m 644 dist/amazon-efs-mount-watchdog.conf ${BUILD_ROOT}/etc/init
+              install -p -m 644 dist/amazon-efs-mount-watchdog.service ${BUILD_ROOT}/etc/systemd/system
+              install -p -m 444 dist/efs-utils.crt ${BUILD_ROOT}/etc/amazon/efs
+              install -p -m 644 dist/efs-utils.conf ${BUILD_ROOT}/etc/amazon/efs
+              install -p -m 755 src/mount_efs/__init__.py ${BUILD_ROOT}/usr/bin/mount.efs
+              install -p -m 755 src/proxy/target/release/efs-proxy ${BUILD_ROOT}/usr/bin/efs-proxy
+              install -p -m 755 src/watchdog/__init__.py ${BUILD_ROOT}/usr/bin/amazon-efs-mount-watchdog
 
-          mv ${{targets.contextdir}}/etc/amazon/efs ${{targets.contextdir}}/etc/amazon/efs-static-files
-      - name: edit shbang for python
-        runs: |
-          d=${{targets.destdir}}
-          for p in $d/usr/bin/amazon-efs-mount-watchdog $d/usr/bin/mount.efs ; do
-            sed -i -e '1s,^#!.*python3$,#!/usr/bin/python${{vars.py-version}},' "$p"
-          done
+              mv ${{targets.contextdir}}/etc/amazon/efs ${{targets.contextdir}}/etc/amazon/efs-static-files
+          - name: edit shbang for python
+            runs: |
+              d=${{targets.destdir}}
+              for p in $d/usr/bin/amazon-efs-mount-watchdog $d/usr/bin/mount.efs ; do
+                sed -i -e '1s,^#!.*python3$,#!/usr/bin/python${{vars.py-version}},' "$p"
+              done
     test:
       pipeline:
         - runs: |