diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5a8b42311..27296f1f8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -67,11 +67,15 @@ jobs:
         uses: actions/checkout@v2
 
       # Cross Build for ARMv7
-      - name: Cross Build for ARMv7
+      - name: Cross Build for ARMv7 on Ubuntu16
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cross-armv7 .
+      - name: Cross Build for ARMv7 on Ubuntu20
+        run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cross-armv7 .
       # Cross Build for AARCH64
-      - name: Cross Build for AARCH64
+      - name: Cross Build for AARCH64 on Ubuntu16
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cross-aarch64 .
+      - name: Cross Build for AARCH64 on Ubuntu20
+        run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cross-aarch64 .
 
   build:
     name: actions-test-build
diff --git a/trunk/Dockerfile.builds b/trunk/Dockerfile.builds
index a63a3229f..7111eee3e 100644
--- a/trunk/Dockerfile.builds
+++ b/trunk/Dockerfile.builds
@@ -74,3 +74,14 @@ FROM ossrs/srs:ubuntu16 AS ubuntu16-cross-aarch64
 COPY . /srs
 RUN cd /srs/trunk && ./configure --jobs=2 --srt=off --cross-build --cc=aarch64-linux-gnu-gcc --cxx=aarch64-linux-gnu-g++ \
     --ar=aarch64-linux-gnu-ar --ld=aarch64-linux-gnu-ld --randlib=aarch64-linux-gnu-randlib && make -j2
+
+########################################################
+FROM ossrs/srs:ubuntu20 AS ubuntu20-cross-armv7
+COPY . /srs
+RUN cd /srs/trunk && ./configure --jobs=2 --srt=off --cross-build --cc=arm-linux-gnueabihf-gcc --cxx=arm-linux-gnueabihf-g++ \
+    --ar=arm-linux-gnueabihf-ar --ld=arm-linux-gnueabihf-ld --randlib=arm-linux-gnueabihf-randlib && make -j2
+
+FROM ossrs/srs:ubuntu20 AS ubuntu20-cross-aarch64
+COPY . /srs
+RUN cd /srs/trunk && ./configure --jobs=2 --srt=off --cross-build --cc=aarch64-linux-gnu-gcc --cxx=aarch64-linux-gnu-g++ \
+    --ar=aarch64-linux-gnu-ar --ld=aarch64-linux-gnu-ld --randlib=aarch64-linux-gnu-randlib && make -j2