diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 08556fb..dfc8ddf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -140,7 +140,7 @@ jobs:
         include: [
           { name: 'ARM64',           xcc_pkg: gcc-aarch64-linux-gnu,        xcc: aarch64-linux-gnu-gcc,        xemu_pkg: qemu-system-arm,   xemu: qemu-aarch64-static, os: ubuntu-latest, },
 
-          { name: 'ARM64, gcc-7',    xcc_pkg: gcc-7-aarch64-linux-gnu,      xcc: aarch64-linux-gnu-gcc-7,      xemu_pkg: qemu-system-arm,   xemu: qemu-aarch64-static, os: ubuntu-18.04, },
+          { name: 'ARM64, gcc-9',    xcc_pkg: gcc-9-aarch64-linux-gnu,      xcc: aarch64-linux-gnu-gcc-9,      xemu_pkg: qemu-system-arm,   xemu: qemu-aarch64-static, os: ubuntu-20.04, },
         ]
     env:                        # Set environment variables
       CC: ${{ matrix.xcc }}
@@ -205,7 +205,7 @@ jobs:
       fail-fast: true
       matrix:
         include:
-        - os: ubuntu-18.04
+        - os: ubuntu-20.04
         - os: ubuntu-latest
     steps:
     - name: "Release Build Type"