diff --git a/base/images/images.toml b/base/images/images.toml
index 8a3ccf643c8..24e100ad941 100644
--- a/base/images/images.toml
+++ b/base/images/images.toml
@@ -65,6 +65,124 @@ container = false
systemd = true
runtime-package-management = true
+# ---- marketplace-gen2 ---------------------------------------------------
+
+[images.marketplace-gen2]
+description = "Marketplace Gen2 Image"
+definition = { type = "kiwi", path = "marketplace-gen2/marketplace-gen2.kiwi", profile = "marketplace-gen2" }
+tests.test-suites = [
+ { name = "static-image-checks" },
+ { name = "lisa-main" },
+ { name = "lisa-xfs" },
+ { name = "lisa-perf" },
+ { name = "lisa-smoke" },
+ { name = "lisa-kernel-ltp" },
+]
+
+[images.marketplace-gen2.capabilities]
+machine-bootable = true
+container = false
+systemd = true
+runtime-package-management = true
+
+[images.marketplace-gen2-dev]
+description = "Marketplace Gen2 Image (dev)"
+definition = { type = "kiwi", path = "marketplace-gen2/marketplace-gen2.kiwi", profile = "marketplace-gen2-dev" }
+tests.test-suites = [
+ { name = "static-image-checks" },
+ { name = "lisa-main" },
+ { name = "lisa-xfs" },
+ { name = "lisa-perf" },
+ { name = "lisa-smoke" },
+ { name = "lisa-kernel-ltp" },
+]
+
+[images.marketplace-gen2-dev.capabilities]
+machine-bootable = true
+container = false
+systemd = true
+runtime-package-management = true
+
+# ---- marketplace-gen2-cvm -----------------------------------------------
+
+[images.marketplace-gen2-cvm]
+description = "Marketplace Gen2 Confidential VM Image"
+definition = { type = "kiwi", path = "marketplace-gen2-cvm/marketplace-gen2-cvm.kiwi", profile = "marketplace-gen2-cvm" }
+tests.test-suites = [
+ { name = "static-image-checks" },
+ { name = "lisa-main" },
+ { name = "lisa-xfs" },
+ { name = "lisa-perf" },
+ { name = "lisa-smoke" },
+ { name = "lisa-cvm" },
+ { name = "lisa-kernel-ltp" },
+]
+
+[images.marketplace-gen2-cvm.capabilities]
+machine-bootable = true
+container = false
+systemd = true
+runtime-package-management = true
+
+[images.marketplace-gen2-cvm-dev]
+description = "Marketplace Gen2 Confidential VM Image (dev)"
+definition = { type = "kiwi", path = "marketplace-gen2-cvm/marketplace-gen2-cvm.kiwi", profile = "marketplace-gen2-cvm-dev" }
+tests.test-suites = [
+ { name = "static-image-checks" },
+ { name = "lisa-main" },
+ { name = "lisa-xfs" },
+ { name = "lisa-perf" },
+ { name = "lisa-smoke" },
+ { name = "lisa-cvm" },
+ { name = "lisa-kernel-ltp" },
+]
+
+[images.marketplace-gen2-cvm-dev.capabilities]
+machine-bootable = true
+container = false
+systemd = true
+runtime-package-management = true
+
+# ---- marketplace-gen2-fips ----------------------------------------------
+
+[images.marketplace-gen2-fips]
+description = "Marketplace Gen2 FIPS Image"
+definition = { type = "kiwi", path = "marketplace-gen2-fips/marketplace-gen2-fips.kiwi", profile = "marketplace-gen2-fips" }
+tests.test-suites = [
+ { name = "static-image-checks" },
+ { name = "lisa-main" },
+ { name = "lisa-xfs" },
+ { name = "lisa-perf" },
+ { name = "lisa-smoke" },
+ { name = "lisa-kernel-ltp" },
+ { name = "lisa-fips" },
+]
+
+[images.marketplace-gen2-fips.capabilities]
+machine-bootable = true
+container = false
+systemd = true
+runtime-package-management = true
+
+[images.marketplace-gen2-fips-dev]
+description = "Marketplace Gen2 FIPS Image (dev)"
+definition = { type = "kiwi", path = "marketplace-gen2-fips/marketplace-gen2-fips.kiwi", profile = "marketplace-gen2-fips-dev" }
+tests.test-suites = [
+ { name = "static-image-checks" },
+ { name = "lisa-main" },
+ { name = "lisa-xfs" },
+ { name = "lisa-perf" },
+ { name = "lisa-smoke" },
+ { name = "lisa-kernel-ltp" },
+ { name = "lisa-fips" },
+]
+
+[images.marketplace-gen2-fips-dev.capabilities]
+machine-bootable = true
+container = false
+systemd = true
+runtime-package-management = true
+
# ---- minimal-os --------------------------------------------------------
[images.minimal-os]
@@ -221,6 +339,10 @@ description = "Lisa cvm tests"
type = "lisa"
description = "Lisa kernel LTP tests"
+[test-suites.lisa-fips]
+type = "lisa"
+description = "Lisa FIPS tests"
+
# Single shared pytest suite for static (offline) image validation.
[test-suites.static-image-checks]
type = "pytest"
diff --git a/base/images/marketplace-gen2-cvm/marketplace-gen2-cvm.kiwi b/base/images/marketplace-gen2-cvm/marketplace-gen2-cvm.kiwi
new file mode 100644
index 00000000000..fc530990b17
--- /dev/null
+++ b/base/images/marketplace-gen2-cvm/marketplace-gen2-cvm.kiwi
@@ -0,0 +1,213 @@
+
+
+
+
+ Azure Linux
+ azurelinux@microsoft.com
+ Azure Linux 4.0 Marketplace Gen2 Confidential VM (CVM) Image
+
+
+
+
+
+
+
+
+
+ 0.1
+ dnf5
+ en_US
+ us
+ UTC
+ 4.0
+
+
+ 5
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/base/images/marketplace-gen2-fips/marketplace-gen2-fips.kiwi b/base/images/marketplace-gen2-fips/marketplace-gen2-fips.kiwi
new file mode 100644
index 00000000000..0b3f4e3f358
--- /dev/null
+++ b/base/images/marketplace-gen2-fips/marketplace-gen2-fips.kiwi
@@ -0,0 +1,247 @@
+
+
+
+
+ Azure Linux
+ azurelinux@microsoft.com
+ Azure Linux 4.0 Marketplace Gen2 (UEFI) FIPS Image
+
+
+
+
+
+
+
+
+ 0.1
+ dnf5
+ en_US
+ us
+ UTC
+ 4.0
+
+
+ 5
+
+ false
+
+
+
+
+
+ 0.1
+ dnf5
+ en_US
+ us
+ UTC
+ 4.0
+
+
+ 5
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/base/images/marketplace-gen2/marketplace-gen2.kiwi b/base/images/marketplace-gen2/marketplace-gen2.kiwi
new file mode 100644
index 00000000000..92cfa15a0ae
--- /dev/null
+++ b/base/images/marketplace-gen2/marketplace-gen2.kiwi
@@ -0,0 +1,244 @@
+
+
+
+
+ Azure Linux
+ azurelinux@microsoft.com
+ Azure Linux 4.0 Marketplace Gen2 (UEFI) Image
+
+
+
+
+
+
+
+
+ 0.1
+ dnf5
+ en_US
+ us
+ UTC
+ 4.0
+
+
+ 5
+
+ false
+
+
+
+
+
+ 0.1
+ dnf5
+ en_US
+ us
+ UTC
+ 4.0
+
+
+ 5
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+