diff --git a/src/ubuntu/20.04/cross/haiku/Dockerfile b/src/ubuntu/20.04/cross/haiku/Dockerfile
deleted file mode 100644
index 8cefa1219..000000000
--- a/src/ubuntu/20.04/cross/haiku/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-crossdeps
-
-ADD rootfs.x64.tar crossrootfs
diff --git a/src/ubuntu/20.04/cross/riscv64/Dockerfile b/src/ubuntu/20.04/cross/riscv64/Dockerfile
deleted file mode 100644
index 1a10f5a9c..000000000
--- a/src/ubuntu/20.04/cross/riscv64/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-crossdeps
-
-ADD rootfs.riscv64.tar crossrootfs
-
-# Install llvm 15 so we get the 'Relax R_RISCV_ALIGN' fix 
-#   * https://github.com/llvm/llvm-project/issues/44181
-#   * https://github.com/llvm/llvm-project/commit/6611d58f5bbcbec77262d392e2923e1d680f6985
-#
-# Use installation script from llvm.org and cleanup apt lists because
-# it uses apt's update and install commands.
-RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 15 all \
-    && rm -rf /var/lib/apt/lists/*
diff --git a/src/ubuntu/20.04/cross/riscv64/hooks/pre-build b/src/ubuntu/20.04/cross/riscv64/hooks/pre-build
deleted file mode 100755
index 0693f0e6e..000000000
--- a/src/ubuntu/20.04/cross/riscv64/hooks/pre-build
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-SCRIPT=$(readlink -f "$0")
-SCRIPTPATH=$(dirname "$SCRIPT")
-$SCRIPTPATH/../../../../build-scripts/build-rootfs.sh ubuntu-20.04 focal riscv64
diff --git a/src/ubuntu/20.04/crossdeps/Dockerfile b/src/ubuntu/20.04/crossdeps/Dockerfile
index 7ba500af2..19503dfa5 100644
--- a/src/ubuntu/20.04/crossdeps/Dockerfile
+++ b/src/ubuntu/20.04/crossdeps/Dockerfile
@@ -14,8 +14,6 @@ RUN apt-get update \
     && apt-get install -y \
         binfmt-support \
         binutils-arm-linux-gnueabihf \
-        bison \
-        bisonc++ \
         build-essential \
         cmake \
         cpio \
@@ -23,7 +21,6 @@ RUN apt-get update \
         flex \
         gdb \
         make \
-        nasm \
         qemu \
         qemu-user-static \
         rpm2cpio \
@@ -34,7 +31,6 @@ RUN apt-get update \
         libbsd-dev \
         libmpc-dev \
         libxml2-utils \
-        libzstd-dev \
     && rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update \
diff --git a/src/ubuntu/22.04/coredeps/Dockerfile b/src/ubuntu/22.04/coredeps/Dockerfile
new file mode 100644
index 000000000..ebbab49bf
--- /dev/null
+++ b/src/ubuntu/22.04/coredeps/Dockerfile
@@ -0,0 +1,35 @@
+FROM mcr.microsoft.com/powershell:7.2-ubuntu-22.04
+
+# Install tools used by the VSO build automation.
+RUN apt-get update \
+    && apt-get install -y \
+        git \
+        nodejs \
+        npm \
+        tar \
+        zip \
+    && rm -rf /var/lib/apt/lists/* \
+    && npm install -g azure-cli@0.9.20 \
+    && npm cache clean --force
+
+# Runtime dependencies
+RUN apt-get update \
+    && apt-get install -y \
+        autoconf \
+        automake \
+        build-essential \
+        gettext \
+        jq \
+        libcurl4-openssl-dev \
+        libgdiplus \
+        libicu-dev \
+        libkrb5-dev \
+        liblttng-ust-dev \
+        libnuma-dev \
+        libssl-dev \
+        libtool \
+        libunwind8 \
+        libunwind8-dev \
+        python3 \
+        uuid-dev \
+    && rm -rf /var/lib/apt/lists/*
diff --git a/src/ubuntu/22.04/cross/haiku/Dockerfile b/src/ubuntu/22.04/cross/haiku/Dockerfile
new file mode 100644
index 000000000..983cd5a73
--- /dev/null
+++ b/src/ubuntu/22.04/cross/haiku/Dockerfile
@@ -0,0 +1,3 @@
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps
+
+ADD rootfs.x64.tar crossrootfs
diff --git a/src/ubuntu/20.04/cross/haiku/hooks/post-build b/src/ubuntu/22.04/cross/haiku/hooks/post-build
similarity index 100%
rename from src/ubuntu/20.04/cross/haiku/hooks/post-build
rename to src/ubuntu/22.04/cross/haiku/hooks/post-build
diff --git a/src/ubuntu/20.04/cross/haiku/hooks/pre-build b/src/ubuntu/22.04/cross/haiku/hooks/pre-build
similarity index 65%
rename from src/ubuntu/20.04/cross/haiku/hooks/pre-build
rename to src/ubuntu/22.04/cross/haiku/hooks/pre-build
index 63d872a2a..e96564ad7 100755
--- a/src/ubuntu/20.04/cross/haiku/hooks/pre-build
+++ b/src/ubuntu/22.04/cross/haiku/hooks/pre-build
@@ -2,4 +2,4 @@
 
 SCRIPT=$(readlink -f "$0")
 SCRIPTPATH=$(dirname "$SCRIPT")
-$SCRIPTPATH/../../../../build-scripts/build-rootfs.sh ubuntu-20.04 haiku x64 "" /rootfs/x64/boot/system/bin
+$SCRIPTPATH/../../../../build-scripts/build-rootfs.sh ubuntu-22.04 haiku x64 "" /rootfs/x64/boot/system/bin
diff --git a/src/ubuntu/22.04/cross/riscv64/Dockerfile b/src/ubuntu/22.04/cross/riscv64/Dockerfile
new file mode 100644
index 000000000..1150967f0
--- /dev/null
+++ b/src/ubuntu/22.04/cross/riscv64/Dockerfile
@@ -0,0 +1,3 @@
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps
+
+ADD rootfs.riscv64.tar crossrootfs
diff --git a/src/ubuntu/20.04/cross/riscv64/hooks/post-build b/src/ubuntu/22.04/cross/riscv64/hooks/post-build
similarity index 100%
rename from src/ubuntu/20.04/cross/riscv64/hooks/post-build
rename to src/ubuntu/22.04/cross/riscv64/hooks/post-build
diff --git a/src/ubuntu/22.04/cross/riscv64/hooks/pre-build b/src/ubuntu/22.04/cross/riscv64/hooks/pre-build
new file mode 100755
index 000000000..75e81267c
--- /dev/null
+++ b/src/ubuntu/22.04/cross/riscv64/hooks/pre-build
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+$SCRIPTPATH/../../../../build-scripts/build-rootfs.sh ubuntu-22.04 jammy riscv64
diff --git a/src/ubuntu/22.04/crossdeps/Dockerfile b/src/ubuntu/22.04/crossdeps/Dockerfile
new file mode 100644
index 000000000..a143128ec
--- /dev/null
+++ b/src/ubuntu/22.04/crossdeps/Dockerfile
@@ -0,0 +1,49 @@
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-coredeps
+
+# Install the base toolchain we need to build anything (clang, cmake, make and the like).
+RUN apt-get update \
+    && apt-get install -y \
+        apt-transport-https \
+        ca-certificates \
+        gnupg \
+        software-properties-common \
+        wget \
+    && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
+    && apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main' \
+    && apt-get update \
+    && apt-get install -y \
+        binfmt-support \
+        binutils-arm-linux-gnueabihf \
+        bison \
+        bisonc++ \
+        build-essential \
+        cmake \
+        cpio \
+        debootstrap \
+        flex \
+        gdb \
+        make \
+        nasm \
+        qemu \
+        qemu-user-static \
+        rpm2cpio \
+        libbz2-dev \
+        libz-dev \
+        liblzma-dev \
+        libarchive-dev \
+        libbsd-dev \
+        libmpc-dev \
+        libxml2-utils \
+        libzstd-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# install llvm-toolchain v15 using official script
+RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 15  \
+        clang \
+        clang-tools \
+        liblldb-dev \
+        lld \
+        lldb \
+        llvm \
+        python3-lldb  \
+    && rm -rf /var/lib/apt/lists/*
diff --git a/src/ubuntu/manifest.json b/src/ubuntu/manifest.json
index 187ebfee1..7bb2b417a 100644
--- a/src/ubuntu/manifest.json
+++ b/src/ubuntu/manifest.json
@@ -675,11 +675,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/ubuntu/20.04/cross/riscv64",
+              "architecture": "amd64",
+              "dockerfile": "src/ubuntu/20.04/crossdac/amd64",
               "os": "linux",
               "osVersion": "focal",
               "tags": {
-                "ubuntu-20.04-cross-riscv64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+                "ubuntu-20.04-crossdac-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
               }
             }
           ]
@@ -687,11 +688,15 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/ubuntu/20.04/cross/haiku",
+              "architecture": "amd64",
+              "dockerfile": "src/ubuntu/20.04/helix/amd64",
               "os": "linux",
               "osVersion": "focal",
               "tags": {
-                "ubuntu-20.04-cross-haiku-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+                "ubuntu-20.04-helix-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-20.04-helix-amd64": {
+                  "isLocal": true
+                }
               }
             }
           ]
@@ -700,11 +705,11 @@
           "platforms": [
             {
               "architecture": "amd64",
-              "dockerfile": "src/ubuntu/20.04/crossdac/amd64",
+              "dockerfile": "src/ubuntu/20.04/helix/wasm/amd64",
               "os": "linux",
               "osVersion": "focal",
               "tags": {
-                "ubuntu-20.04-crossdac-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+                "ubuntu-20.04-helix-wasm-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
               }
             }
           ]
@@ -712,13 +717,12 @@
         {
           "platforms": [
             {
-              "architecture": "amd64",
-              "dockerfile": "src/ubuntu/20.04/helix/amd64",
+              "dockerfile": "src/ubuntu/20.04/amd64",
               "os": "linux",
               "osVersion": "focal",
               "tags": {
-                "ubuntu-20.04-helix-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "ubuntu-20.04-helix-amd64": {
+                "ubuntu-20.04-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-20.04": {
                   "isLocal": true
                 }
               }
@@ -728,12 +732,14 @@
         {
           "platforms": [
             {
-              "architecture": "amd64",
-              "dockerfile": "src/ubuntu/20.04/helix/wasm/amd64",
+              "dockerfile": "src/ubuntu/22.04/amd64",
               "os": "linux",
-              "osVersion": "focal",
+              "osVersion": "jammy",
               "tags": {
-                "ubuntu-20.04-helix-wasm-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+                "ubuntu-22.04-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-22.04": {
+                  "isLocal": true
+                }
               }
             }
           ]
@@ -741,12 +747,12 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/ubuntu/20.04/amd64",
+              "dockerfile": "src/ubuntu/22.04/coredeps",
               "os": "linux",
-              "osVersion": "focal",
+              "osVersion": "jammy",
               "tags": {
-                "ubuntu-20.04-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "ubuntu-20.04": {
+                "ubuntu-22.04-coredeps-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-22.04-coredeps": {
                   "isLocal": true
                 }
               }
@@ -756,18 +762,42 @@
         {
           "platforms": [
             {
-              "dockerfile": "src/ubuntu/22.04/amd64",
+              "dockerfile": "src/ubuntu/22.04/crossdeps",
               "os": "linux",
               "osVersion": "jammy",
               "tags": {
-                "ubuntu-22.04-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "ubuntu-22.04": {
+                "ubuntu-22.04-crossdeps-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-22.04-crossdeps": {
                   "isLocal": true
                 }
               }
             }
           ]
         },
+        {
+          "platforms": [
+            {
+              "dockerfile": "src/ubuntu/22.04/cross/riscv64",
+              "os": "linux",
+              "osVersion": "jammy",
+              "tags": {
+                "ubuntu-22.04-cross-riscv64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+              }
+            }
+          ]
+        },
+        {
+          "platforms": [
+            {
+              "dockerfile": "src/ubuntu/22.04/cross/haiku",
+              "os": "linux",
+              "osVersion": "jammy",
+              "tags": {
+                "ubuntu-22.04-cross-haiku-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
+              }
+            }
+          ]
+        },
         {
           "platforms": [
             {