diff --git a/.github/workflows/aws-e2e.yaml b/.github/workflows/aws-e2e.yaml
index 0bb2fda74..d24f261ef 100644
--- a/.github/workflows/aws-e2e.yaml
+++ b/.github/workflows/aws-e2e.yaml
@@ -81,6 +81,11 @@ jobs:
             buildConfig: "nvidia"
           - os: "ubuntu 20.04"
             buildConfig: "offline"
+          # Ubuntu 22.04
+          - os: "ubuntu 22.04"
+            buildConfig: "basic"
+          - os: "ubuntu 22.04"
+            buildConfig: "nvidia"
           # Rocky 9.1
           - os: "rocky 9.1"
             buildConfig: "basic"
diff --git a/.github/workflows/release-ami.yaml b/.github/workflows/release-ami.yaml
index e0cceb6b6..1599e9c14 100644
--- a/.github/workflows/release-ami.yaml
+++ b/.github/workflows/release-ami.yaml
@@ -41,6 +41,10 @@ jobs:
             buildConfig: "nvidia"
           - os: "ubuntu 20.04"
             buildConfig: "basic"
+          - os: "ubuntu 22.04"
+            buildConfig: "basic"
+          - os: "ubuntu 22.04"
+            buildConfig: "nvidia"
           - os: "flatcar"
             buildConfig: "basic"
 
diff --git a/images/ami/ubuntu-2204.yaml b/images/ami/ubuntu-2204.yaml
new file mode 100644
index 000000000..13409e505
--- /dev/null
+++ b/images/ami/ubuntu-2204.yaml
@@ -0,0 +1,17 @@
+---
+build_name: "ubuntu-22"
+packer_builder_type: "amazon"
+python_path: ""
+# The latest cloud-init version is unable to run #boothook created by CAPA https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5115
+# This is a workaround to downgrade to older cloud-init version.
+# https://github.com/kubernetes-sigs/image-builder/pull/1590/files
+pinned_debs: ["cloud-init=23.1.2-0ubuntu0~22.04.1"]
+packer:
+  ami_filter_name: "ubuntu/images/*ubuntu-jammy-22.04-amd64-server-*"
+  ami_filter_owners: "099720109477"
+  source_ami: ""
+  distribution: "Ubuntu"
+  distribution_version: "22.04"
+  ssh_username: "ubuntu"
+  root_device_name: "/dev/sda1"
+  volume_size: "15"