diff --git a/.github/workflows/android-app-multiple.yml b/.github/workflows/android-app-multiple.yml
index f228b6a57e8f..26c1c2eef9fd 100644
--- a/.github/workflows/android-app-multiple.yml
+++ b/.github/workflows/android-app-multiple.yml
@@ -21,7 +21,8 @@ jobs:
 
       - name: Use custom container image if specified
         if: ${{ github.event.inputs.override_container_image != '' }}
-        run: echo "inner_container_image=${{ github.event.inputs.override_container_image }}"
+        run:
+          echo "inner_container_image=${{ github.event.inputs.override_container_image }}"
           >> $GITHUB_ENV
 
       - name: Use default container image and resolve digest
@@ -40,7 +41,109 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        attempt: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30]
+        attempt:
+          [
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            35,
+            36,
+            37,
+            38,
+            39,
+            40,
+            41,
+            42,
+            43,
+            44,
+            45,
+            46,
+            47,
+            48,
+            49,
+            50,
+            51,
+            52,
+            53,
+            54,
+            55,
+            56,
+            57,
+            58,
+            59,
+            60,
+            61,
+            62,
+            63,
+            64,
+            65,
+            66,
+            67,
+            68,
+            69,
+            70,
+            71,
+            72,
+            73,
+            74,
+            75,
+            76,
+            77,
+            78,
+            79,
+            80,
+            81,
+            82,
+            83,
+            84,
+            85,
+            86,
+            87,
+            88,
+            89,
+            90,
+            91,
+            92,
+            93,
+            94,
+            95,
+            96,
+            97,
+            98,
+            99,
+           100,
+          ]
     steps:
       # Fix for HOME path overridden by GH runners when building in containers, see:
       # https://github.com/actions/runner/issues/863
diff --git a/build-apk.sh b/build-apk.sh
index 8cccf27599ac..d0ca1bd0c044 100755
--- a/build-apk.sh
+++ b/build-apk.sh
@@ -77,9 +77,9 @@ mkdir -p "app/build/extraAssets"
 mkdir -p "app/build/extraJni"
 popd
 
-cargo install --force cbindgen
+#cargo install --force cbindgen
 
-for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do
+for ARCHITECTURE in ${ARCHITECTURES:-x86_64}; do
     case "$ARCHITECTURE" in
         "x86_64")
             TARGET="x86_64-linux-android"
diff --git a/wireguard-go-rs/libwg/wireguard-go b/wireguard-go-rs/libwg/wireguard-go
index 265d73245fad..131decf43ffc 160000
--- a/wireguard-go-rs/libwg/wireguard-go
+++ b/wireguard-go-rs/libwg/wireguard-go
@@ -1 +1 @@
-Subproject commit 265d73245fad6e313f153e031445cafa203c5b4a
+Subproject commit 131decf43ffcaee6f6d9b74424188154dd91b4c1