diff --git a/.github/workflows/image-arm.yaml b/.github/workflows/image-arm.yaml
index 54780c71d..1fab49798 100644
--- a/.github/workflows/image-arm.yaml
+++ b/.github/workflows/image-arm.yaml
@@ -188,7 +188,7 @@ jobs:
     secrets: inherit
     with:
       flavor: ubuntu
-      flavor_release: "20.04"
+      flavor_release: "22.04"
       family: ubuntu
       base_image: quay.io/kairos/cache:nvidia-base
       model: nvidia-jetson-agx-orin
diff --git a/.github/workflows/release-arm.yaml b/.github/workflows/release-arm.yaml
index fb14f686d..0e99b5f87 100644
--- a/.github/workflows/release-arm.yaml
+++ b/.github/workflows/release-arm.yaml
@@ -123,7 +123,7 @@ jobs:
     secrets: inherit
     with:
       flavor: ubuntu
-      flavor_release: "20.04"
+      flavor_release: "22.04"
       family: ubuntu
       base_image: quay.io/kairos/cache:nvidia-base
       model: nvidia-jetson-agx-orin
diff --git a/images/Dockerfile.kairos-ubuntu b/images/Dockerfile.kairos-ubuntu
index 5b14f52a1..fa6ce9c31 100644
--- a/images/Dockerfile.kairos-ubuntu
+++ b/images/Dockerfile.kairos-ubuntu
@@ -319,7 +319,7 @@ FROM ubuntu-22.04-rpi AS arm64-ubuntu-22.04-rpi3
 FROM ubuntu-22.04-rpi AS arm64-ubuntu-22.04-rpi4
 FROM ubuntu-20.04-rpi AS arm64-ubuntu-20.04-rpi3
 FROM ubuntu-20.04-rpi AS arm64-ubuntu-20.04-rpi4
-FROM ubuntu-20.04-upstream AS arm64-ubuntu-20.04-nvidia-jetson-agx-orin
+FROM ubuntu-22.04-upstream AS arm64-ubuntu-22.04-nvidia-jetson-agx-orin
 
 ###############################################################
 ####                Common to a Single Flavor              ####
diff --git a/images/Dockerfile.nvidia b/images/Dockerfile.nvidia
index acac5c220..603f653f1 100644
--- a/images/Dockerfile.nvidia
+++ b/images/Dockerfile.nvidia
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 as base
+FROM ubuntu:22.04 as base
 
 RUN apt-get update
 RUN apt-get install -y ca-certificates
diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
index 647e7a7a8..93cc00d5d 100644
--- a/images/Dockerfile.ubuntu
+++ b/images/Dockerfile.ubuntu
@@ -320,7 +320,7 @@ FROM ubuntu-22.04-rpi AS arm64-ubuntu-22.04-rpi3
 FROM ubuntu-22.04-rpi AS arm64-ubuntu-22.04-rpi4
 FROM ubuntu-20.04-rpi AS arm64-ubuntu-20.04-rpi3
 FROM ubuntu-20.04-rpi AS arm64-ubuntu-20.04-rpi4
-FROM ubuntu-20.04-upstream AS arm64-ubuntu-20.04-nvidia-jetson-agx-orin
+FROM ubuntu-22.04-upstream AS arm64-ubuntu-22.04-nvidia-jetson-agx-orin
 
 ###############################################################
 ####                Common to a Single Flavor              ####