diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index a5b8af2..b37f5e8 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         lws-version: [4.1.6, 3.2.3, 2.4.2]
@@ -41,10 +41,10 @@ jobs:
           make && sudo make install
           ttyd -v
   cross:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        target: [i686, x86_64, arm, armhf, aarch64, mips, mipsel, mips64, mips64el]
+        target: [i686, x86_64, arm, armhf, aarch64, mips, mipsel, mips64, mips64el, s390x]
     steps:
       - uses: actions/checkout@v2
       - name: Install packages
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f630578..09ced6d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }} 
     steps:
@@ -23,11 +23,11 @@ jobs:
           prerelease: false
 
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     needs: release
     strategy:
       matrix:
-        target: [i686, x86_64, arm, armhf, aarch64, mips, mipsel, mips64, mips64el]
+        target: [i686, x86_64, arm, armhf, aarch64, mips, mipsel, mips64, mips64el, s390x]
     steps:
       - uses: actions/checkout@v2
       - name: Install packages