diff --git a/.github/workflows/build-toolchain.yml b/.github/workflows/build-toolchain.yml
index e776f5db28a38..ea915a1911af4 100644
--- a/.github/workflows/build-toolchain.yml
+++ b/.github/workflows/build-toolchain.yml
@@ -8,6 +8,7 @@ on:
       - swiftwasm-release/5.4
       - swiftwasm-release/5.5
       - swiftwasm-release/5.6
+      - swiftwasm-release/5.7
   pull_request:
     branches:
       - swiftwasm
@@ -15,6 +16,7 @@ on:
       - swiftwasm-release/5.4
       - swiftwasm-release/5.5
       - swiftwasm-release/5.6
+      - swiftwasm-release/5.7
     types: [opened, synchronize, reopened, labeled]
 jobs:
   start-runner:
@@ -117,6 +119,17 @@ jobs:
             "clean_build_dir": false,
             "free_disk_space": true
           },
+          {
+            "build_os": "ubuntu-22.04",
+            "agent_query": "ubuntu-22.04",
+            "target": "ubuntu22.04_x86_64",
+            "run_stdlib_test": true,
+            "run_full_test": false,
+            "run_e2e_test": true,
+            "build_hello_wasm": true,
+            "clean_build_dir": false,
+            "free_disk_space": true
+          },
           {
             "build_os": "macos-11",
             "agent_query": "macos-11",
@@ -201,13 +214,16 @@ jobs:
         if: ${{ matrix.free_disk_space }}
         run: |
           df -h
-          sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev libgcc-10-dev gcc-10 libstdc++-10-dev clang-6.0 llvm-6.0
+          sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev libgcc-10-dev gcc-10 libstdc++-10-dev
           sudo swapoff -a
           sudo rm -f /swapfile
           sudo rm -rf /opt/hostedtoolcache
           sudo rm -rf /usr/share/dotnet
           sudo apt clean
-          docker rmi $(docker image ls -aq)
+          
+          if docker info > /dev/null 2>&1; then
+            docker rmi $(docker image ls -aq)
+          fi
           df -h
 
       - uses: actions/checkout@v2
@@ -247,7 +263,7 @@ jobs:
         run: |
 
           case "${{ matrix.target }}" in
-            "amazonlinux2_x86_64" | "ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "ubuntu20.04_aarch64" | "macos_x86_64" | "macos_arm64")
+            "amazonlinux2_x86_64" | "ubuntu22.04_x86_64" | "ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "ubuntu20.04_aarch64" | "macos_x86_64" | "macos_arm64")
               ./swift/utils/webassembly/ci.sh
             ;;
             *)
diff --git a/utils/webassembly/build-toolchain.sh b/utils/webassembly/build-toolchain.sh
index 5e98f197f99d8..6d33ac81ccba3 100755
--- a/utils/webassembly/build-toolchain.sh
+++ b/utils/webassembly/build-toolchain.sh
@@ -18,6 +18,8 @@ case $(uname -s) in
       OS_SUFFIX=ubuntu18.04_$(uname -m)
     elif [ "$(grep RELEASE /etc/lsb-release)" == "DISTRIB_RELEASE=20.04" ]; then
       OS_SUFFIX=ubuntu20.04_$(uname -m)
+    elif [ "$(grep RELEASE /etc/lsb-release)" == "DISTRIB_RELEASE=22.04" ]; then
+      OS_SUFFIX=ubuntu22.04_$(uname -m)
     elif [[ "$(grep PRETTY_NAME /etc/os-release)" == 'PRETTY_NAME="Amazon Linux 2"' ]]; then
       OS_SUFFIX=amazonlinux2_$(uname -m)
     else
diff --git a/utils/webassembly/linux/install-dependencies.sh b/utils/webassembly/linux/install-dependencies.sh
index 5b260c2afc04a..ab4772f71d8ae 100755
--- a/utils/webassembly/linux/install-dependencies.sh
+++ b/utils/webassembly/linux/install-dependencies.sh
@@ -57,6 +57,14 @@ else
       libpython2-dev libncurses5 libncurses5-dev pkg-config \
       libblocksruntime-dev libcurl4-openssl-dev \
       make systemtap-sdt-dev tzdata rsync wget llvm zip unzip
+  elif [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=22.04" ]; then
+    sudo apt install -y \
+      git ninja-build clang python3 python-six \
+      uuid-dev libicu-dev icu-devtools libbsd-dev \
+      libedit-dev libxml2-dev libsqlite3-dev swig \
+      libpython2-dev libncurses5 libncurses5-dev pkg-config \
+      libblocksruntime-dev libcurl4-openssl-dev \
+      make systemtap-sdt-dev tzdata rsync wget llvm zip unzip
   else
     echo "Unknown Ubuntu version"
     exit 1