diff --git a/.github/workflows/release-vsphere-template.yaml b/.github/workflows/release-vsphere-template.yaml
index de0b6e17a..3d00cb32e 100644
--- a/.github/workflows/release-vsphere-template.yaml
+++ b/.github/workflows/release-vsphere-template.yaml
@@ -23,6 +23,8 @@ jobs:
             buildConfig: "offline-fips"
           - os: "ubuntu 20.04"
             buildConfig: "basic"
+          - os: "ubuntu 22.04"
+            buildConfig: "basic"
           - os: "rocky 9.1"
             buildConfig: "offline"
           - os: "flatcar"
diff --git a/.github/workflows/vsphere-e2e.yaml b/.github/workflows/vsphere-e2e.yaml
index 44fde51cd..ba6dd663c 100644
--- a/.github/workflows/vsphere-e2e.yaml
+++ b/.github/workflows/vsphere-e2e.yaml
@@ -27,6 +27,8 @@ jobs:
           buildConfig: "offline"
         - os: "ubuntu 20.04"
           buildConfig: "basic"
+        - os: "ubuntu 22.04"
+          buildConfig: "basic"
         - os: "rocky 9.1"
           buildConfig: "offline"
         - os: "flatcar"
diff --git a/images/ova/ubuntu-2204.yaml b/images/ova/ubuntu-2204.yaml
new file mode 100644
index 000000000..e872b9a6d
--- /dev/null
+++ b/images/ova/ubuntu-2204.yaml
@@ -0,0 +1,25 @@
+---
+build_name: "ubuntu-2204"
+packer_builder_type: "vsphere"
+guestinfo_datasource_slug: "https://raw.githubusercontent.com/vmware/cloud-init-vmware-guestinfo"
+guestinfo_datasource_ref: "v1.4.0"
+guestinfo_datasource_script: "{{guestinfo_datasource_slug}}/{{guestinfo_datasource_ref}}/install.sh"
+packer:
+  cluster: ""
+  datacenter: ""
+  datastore: ""
+  folder: ""
+  insecure_connection: "false"
+  network: ""
+  resource_pool: ""
+  template: "d2iq-base-templates/d2iq-base-Ubuntu-22.04" # change default value with your base template name
+  vsphere_guest_os_type: "other4xLinux64Guest"
+  guest_os_type: "ubuntu2204-64"
+  # goss params
+  distribution: "ubuntu"
+  distribution_version: "22.04"
+# Use following overrides to select the authentication method that can be used with base template
+# ssh_username: ""  # can be exported as environment variable 'SSH_USERNAME'
+# ssh_password: "" # can be exported as environment variable 'SSH_PASSWORD'
+# ssh_private_key_file = "" # can be exported as environment variable 'SSH_PRIVATE_KEY_FILE'
+# ssh_agent_auth: false  # is set to true, ssh_password and ssh_private_key will be ignored
diff --git a/magefile.go b/magefile.go
index 063ec6702..a16a7c056 100644
--- a/magefile.go
+++ b/magefile.go
@@ -50,6 +50,7 @@ var (
 		"flatcar",
 		"ubuntu 18.04",
 		"ubuntu 20.04",
+		"ubuntu 22.04",
 		"rocky 9.0",
 		"rocky 9.1",
 	}