diff --git a/.github/workflows/build-overlay-deb.yml b/.github/workflows/build-overlay-deb.yml
index 525af500..d532d06a 100644
--- a/.github/workflows/build-overlay-deb.yml
+++ b/.github/workflows/build-overlay-deb.yml
@@ -4,21 +4,26 @@ on:
   workflow_dispatch:
     inputs:
       config:
-        description: 'Path to the YAML configuration file'
+        description: "Path to the YAML configuration file"
         required: true
         type: string
 
+permissions:
+  contents: read
+  id-token: write
+
 jobs:
   build:
     strategy:
       matrix:
-        arch: [amd64, arm64]
-    runs-on: [self-hosted, qcom-u2404, "${{ matrix.arch }}"]
+        arch: [arm64]
+    runs-on: debian-linux-images--linux-arm64-8core-32gb
     env:
       CONFIG: ${{ inputs.config }}
+    environment: staging
     container:
-      image: public.ecr.aws/debian/debian:trixie
-      options: --privileged  # Required for chroot creation
+      image: debian:trixie
+      options: --privileged # Required for chroot creation
     steps:
       - name: Update OS packages
         run: |
@@ -35,7 +40,7 @@ jobs:
           set -ux
           DEBIAN_FRONTEND=noninteractive \
               apt -y install --no-install-recommends \
-                  sudo sbuild gnupg debootstrap debian-archive-keyring schroot
+                  sudo sbuild gnupg debootstrap debian-archive-keyring schroot awscli
 
       - name: Set up sbuild user
         run: |
@@ -91,8 +96,16 @@ jobs:
           sudo -u builder python3 scripts/build-deb.py \
               --config "$CONFIG" --output-dir upload
 
-      - name: Upload as private artifacts
-        uses: qualcomm-linux/upload-private-artifact-action@v1
+      - name: Authenticate AWS
+        uses: aws-actions/configure-aws-credentials@v4
         with:
-          path: upload
+          aws-region: "us-east-1"
+          role-to-assume: ${{ secrets.AWS_IAM_ROLE }}
+          role-session-name: GHA_DebianImages_via_FederatedOIDC
+          mask-aws-account-id: true
 
+      - name: upload to S3
+        run: |
+          for file in upload/*.deb; do
+            aws s3 cp "$file" "s3://${{ secrets.AWS_BUKET }}/build-deb/"
+          done
diff --git a/local-apt-repo/adbd/adbd_34.0.5-12arduino3_arm64.deb b/local-apt-repo/adbd/adbd_34.0.5-12arduino3_arm64.deb
deleted file mode 100644
index 6f5476c5..00000000
Binary files a/local-apt-repo/adbd/adbd_34.0.5-12arduino3_arm64.deb and /dev/null differ
diff --git a/local-apt-repo/adbd/adbd_34.0.5-12arduino4_arm64.deb b/local-apt-repo/adbd/adbd_34.0.5-12arduino4_arm64.deb
new file mode 100644
index 00000000..aae92150
Binary files /dev/null and b/local-apt-repo/adbd/adbd_34.0.5-12arduino4_arm64.deb differ
diff --git a/local-apt-repo/adbd/android-libbacktrace_34.0.5-12arduino3_arm64.deb b/local-apt-repo/adbd/android-libbacktrace_34.0.5-12arduino4_arm64.deb
similarity index 87%
rename from local-apt-repo/adbd/android-libbacktrace_34.0.5-12arduino3_arm64.deb
rename to local-apt-repo/adbd/android-libbacktrace_34.0.5-12arduino4_arm64.deb
index 3a098bb6..351f53a2 100644
Binary files a/local-apt-repo/adbd/android-libbacktrace_34.0.5-12arduino3_arm64.deb and b/local-apt-repo/adbd/android-libbacktrace_34.0.5-12arduino4_arm64.deb differ
diff --git a/local-apt-repo/adbd/android-libbase_34.0.5-12arduino3_arm64.deb b/local-apt-repo/adbd/android-libbase_34.0.5-12arduino4_arm64.deb
similarity index 81%
rename from local-apt-repo/adbd/android-libbase_34.0.5-12arduino3_arm64.deb
rename to local-apt-repo/adbd/android-libbase_34.0.5-12arduino4_arm64.deb
index 0ecd158e..eba0b702 100644
Binary files a/local-apt-repo/adbd/android-libbase_34.0.5-12arduino3_arm64.deb and b/local-apt-repo/adbd/android-libbase_34.0.5-12arduino4_arm64.deb differ
diff --git a/local-apt-repo/adbd/android-libcutils_34.0.5-12arduino3_arm64.deb b/local-apt-repo/adbd/android-libcutils_34.0.5-12arduino4_arm64.deb
similarity index 57%
rename from local-apt-repo/adbd/android-libcutils_34.0.5-12arduino3_arm64.deb
rename to local-apt-repo/adbd/android-libcutils_34.0.5-12arduino4_arm64.deb
index 0681a380..23141c14 100644
Binary files a/local-apt-repo/adbd/android-libcutils_34.0.5-12arduino3_arm64.deb and b/local-apt-repo/adbd/android-libcutils_34.0.5-12arduino4_arm64.deb differ
diff --git a/local-apt-repo/adbd/android-liblog_34.0.5-12arduino3_arm64.deb b/local-apt-repo/adbd/android-liblog_34.0.5-12arduino4_arm64.deb
similarity index 56%
rename from local-apt-repo/adbd/android-liblog_34.0.5-12arduino3_arm64.deb
rename to local-apt-repo/adbd/android-liblog_34.0.5-12arduino4_arm64.deb
index a0dc2f13..4f3e1a95 100644
Binary files a/local-apt-repo/adbd/android-liblog_34.0.5-12arduino3_arm64.deb and b/local-apt-repo/adbd/android-liblog_34.0.5-12arduino4_arm64.deb differ
diff --git a/local-apt-repo/adbd/android-libutils_34.0.5-12arduino3_arm64.deb b/local-apt-repo/adbd/android-libutils_34.0.5-12arduino4_arm64.deb
similarity index 69%
rename from local-apt-repo/adbd/android-libutils_34.0.5-12arduino3_arm64.deb
rename to local-apt-repo/adbd/android-libutils_34.0.5-12arduino4_arm64.deb
index fecf81a0..d085befd 100644
Binary files a/local-apt-repo/adbd/android-libutils_34.0.5-12arduino3_arm64.deb and b/local-apt-repo/adbd/android-libutils_34.0.5-12arduino4_arm64.deb differ
diff --git a/overlay-debs/android-platform-tools/android-platform-tools_34.0.5-12arduino1.debdiff b/overlay-debs/android-platform-tools/android-platform-tools_34.0.5-12arduino1.debdiff
index e42ee34e..b7351430 100644
--- a/overlay-debs/android-platform-tools/android-platform-tools_34.0.5-12arduino1.debdiff
+++ b/overlay-debs/android-platform-tools/android-platform-tools_34.0.5-12arduino1.debdiff
@@ -51,7 +51,7 @@ diff -Nru android-platform-tools-34.0.5/debian/changelog android-platform-tools-
 --- android-platform-tools-34.0.5/debian/changelog	2025-04-04 06:03:19.000000000 +0000
 +++ android-platform-tools-34.0.5/debian/changelog	2025-08-25 09:09:07.000000000 +0000
 @@ -1,3 +1,10 @@
-+android-platform-tools (34.0.5-12arduino3) unstable; urgency=medium
++android-platform-tools (34.0.5-12arduino4) unstable; urgency=medium
 +
 +  * adbd:
 +    - Remove root and switch to bash
@@ -137,13 +137,45 @@ diff -Nru android-platform-tools-34.0.5/debian/patches/adbd/adbd-disable-network
 + #if defined(__ANDROID__)
 +     // Get the first valid port from addrs and setup mDNS.
 +     int port = -1;
+diff -Nru android-platform-tools-34.0.5/debian/patches/adbd/adbd-restart-usb.patch android-platform-tools-34.0.5/debian/patches/adbd/adbd-restart-usb.patch
+--- android-platform-tools-34.0.5/debian/patches/adbd/adbd-restart-usb.patch	1970-01-01 00:00:00.000000000 +0000
++++ android-platform-tools-34.0.5/debian/patches/adbd/adbd-restart-usb.patch	2025-09-11 12:50:26.000000000 +0000
+@@ -0,0 +1,15 @@
++## Description: add some description
++## Origin/Author: add some origin or author
++## Bug: bug URL
++Index: android-platform-tools-35.0.2/packages/modules/adb/transport.cpp
++===================================================================
++--- android-platform-tools-35.0.2.orig/packages/modules/adb/transport.cpp
+++++ android-platform-tools-35.0.2/packages/modules/adb/transport.cpp
++@@ -1251,6 +1251,7 @@ bool atransport::HandleRead(std::unique_ptr<apacket> p) {
++
++ void atransport::HandleError(const std::string& error) {
++     LOG(INFO) << serial_name() << ": connection terminated: " << error;
+++    exit(1);
++     fdevent_run_on_looper([this]() {
++         handle_offline(this);
++         transport_destroy(this);
+diff -Nru android-platform-tools-34.0.5/debian/adbd.service android-platform-tools-34.0.5/debian/adbd.service
+--- android-platform-tools-34.0.5/debian/adbd.service	2025-04-04 06:03:19.000000000 +0000
++++ android-platform-tools-34.0.5/debian/adbd.service	2025-09-11 12:52:01.000000000 +0000
+@@ -10,6 +10,8 @@ ExecStartPre=/usr/lib/android-sdk/platform-tools/adbd-usb-gadget setup
+ ExecStart=/usr/lib/android-sdk/platform-tools/adbd
+ ExecStartPost=/usr/lib/android-sdk/platform-tools/adbd-usb-gadget activate
+ ExecStopPost=/usr/lib/android-sdk/platform-tools/adbd-usb-gadget reset
++Restart=always
++RestartSec=1
+
+ [Install]
+ WantedBy=multi-user.target
 diff -Nru android-platform-tools-34.0.5/debian/patches/series android-platform-tools-34.0.5/debian/patches/series
 --- android-platform-tools-34.0.5/debian/patches/series	2025-04-04 06:03:19.000000000 +0000
 +++ android-platform-tools-34.0.5/debian/patches/series	2025-08-25 09:07:06.000000000 +0000
-@@ -27,3 +27,6 @@
+@@ -27,3 +27,7 @@
  adbd/adbd-allow-notifying-systemd.patch
  adbd/adbd-usb-drop-property-monitor.patch
  adbd/adbd-don-t-require-authorization-on-Linux.patch
 +adbd/adbd-drop-root.patch
 +adbd/adbd-use-bash.patch
 +adbd/adbd-disable-network-mode.patch
++adbd/adbd-restart-usb.patch