diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1122ac9dec..67a71305c6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -524,6 +524,10 @@ jobs:
             openwrt: 'target=sunxi subtarget=cortexa7'
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a7" arm_fpu="neon-vfpv4" arm_float_abi="hard" arm_use_neon=true'
+          - arch: arm_cortex-a7_vfpv4
+            openwrt: 'target=at91 subtarget=sama7'
+            target_cpu: arm
+            extra: 'arm_version=0 arm_cpu="cortex-a7" arm_fpu="vfpv4" arm_float_abi="hard" arm_use_neon=false'
           - arch: arm_cortex-a7_neon-vfpv4-static
             openwrt: 'target=sunxi subtarget=cortexa7'
             target_cpu: arm
@@ -541,7 +545,7 @@ jobs:
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a9" arm_float_abi="soft" arm_use_neon=false build_static=true'
           - arch: arm_cortex-a9_neon
-            openwrt: 'target=imx6'
+            openwrt: 'target=zynq'
             target_cpu: arm
             extra: 'arm_version=0 arm_cpu="cortex-a9" arm_fpu="neon" arm_float_abi="hard" arm_use_neon=true'
           - arch: arm_cortex-a9_vfpv3-d16
@@ -570,7 +574,7 @@ jobs:
             extra: 'mips_arch_variant="r1" mips_float_abi="soft"'
     env:
       EXTRA_FLAGS: target_cpu="${{ matrix.target_cpu }}" target_os="openwrt" use_allocator="none" use_allocator_shim=false use_partition_alloc=false ${{ matrix.extra }}
-      OPENWRT_FLAGS: arch=${{ matrix.arch }} release=21.02.2 gcc_ver=8.4.0 ${{ matrix.openwrt }}
+      OPENWRT_FLAGS: arch=${{ matrix.arch }} release=22.03.0 gcc_ver=11.2.0 ${{ matrix.openwrt }}
       BUNDLE: naiveproxy-${{ github.event.release.tag_name }}-${{ github.job }}-${{ matrix.arch }}
       CRONET_BUNDLE: cronet-${{ github.event.release.tag_name }}-${{ github.job }}-${{ matrix.arch }}
     steps:
@@ -595,7 +599,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: src/out/sysroot-build/openwrt
-          key: sysroot-openwrt-21.02.2-${{ matrix.arch }}-v${{ env.CACHE_EPOCH }}
+          key: sysroot-openwrt-22.03.0-${{ matrix.arch }}-v${{ env.CACHE_EPOCH }}
       - id: ccache-timestamp
         run: echo "::set-output name=date::$(date +%s)"
       - name: Cache ccache files