diff --git a/linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_validation b/linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_validation
index cef393c..64cde35 100644
--- a/linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_validation
+++ b/linux_pipeline/Jenkinsfile_ubuntu_azure_kernel_validation
@@ -155,7 +155,7 @@ properties ([
     parameters([
         choice (name: 'Distro', choices: 'trusty\nxenial\nbionic\nfocal\ngroovy\nhirsute',
                 description: 'trusty - 14.04 validation <br> xenial - 16.04 validation <br> bionic - 18.04 validation <br> focal - 20.04 validation <br> groovy - 20.10 validation <br> hirsute - 21.04 validation '),
-        choice (name: 'KernelType', choices: 'linux-azure\nlinux-azure-edge\nlinux-image-azure-lts-18.04',
+        choice (name: 'KernelType', choices: 'linux-azure\nlinux-azure-edge\nlinux-image-azure-lts-18.04\nesm\nlinux-azure-fips',
                 description: 'linux-azure - latest proposed linux-azure kernel validation <br> linux-azure-edge - latest proposed linux-azure-edge kernel validation'),
         string(name: 'KernelVersion', defaultValue: "", description: 'The exact kernel version to be tested. Example: 5.0.0.1010.9. If left empty, the latest kernel version for the selected distro/kernel type will be used.'),
         choice (name: 'ValidationAzure', choices: 'yes\nno',
@@ -223,6 +223,12 @@ if (env.KernelType == "linux-azure-edge") {
 if (env.KernelType == "linux-image-azure-lts-18.04") {
     env.KERNEL_TYPE = "linux-image-azure-lts-18.04"
 }
+if (env.KernelType == "esm") {
+    env.KERNEL_TYPE = "esm"
+}
+if (env.KernelType == "linux-azure-fips") {
+    env.KERNEL_TYPE = "linux-azure-fips"
+}
 
 env.START_DATE = new java.sql.Timestamp(new Date().getTime())
 env.END_DATE = ""
@@ -550,6 +556,10 @@ node ("meta_slave") {
         version_identifier = "_edge"
     } else if (env.KernelType == "linux-image-azure-lts-18.04") {
         version_identifier = "_azure_lts_1804"
+    } else if (env.KernelType == "esm") {
+        version_identifier = "_esm"
+    } else if (env.KernelType == "linux-azure-fips") {
+        version_identifier = "_azure_fips"
     }
     def kernels_info = ""
     try {