diff --git a/test/msi_values.py b/test/msi_values.py
index 98ffb7b..c574e30 100644
--- a/test/msi_values.py
+++ b/test/msi_values.py
@@ -11,6 +11,8 @@ def get_expected_componentids():
         'CMP_blnsvr_2k16_amd64':['{AC3A4978-2B0A-4E5C-9DAA-327C503E98C6}'],
         'CMP_WinServer2019_balloon':['{0279689F-2B56-47BB-BE08-2D66A0B9F4FC}'],
         'CMP_blnsvr_2k19_amd64':['{367F3AA4-7747-4FDF-A3F9-3D2766D9D07E}'],
+        'CMP_WinServer2022_balloon':['{824217E9-568A-403A-82E1-408171BDB05B}'],
+        'CMP_blnsvr_2k22_amd64':['{D87C64B1-1769-4D6D-B912-C7389AA5F997}'],
         'CMP_Win8x64_balloon':['{08FCD606-81D7-4AA0-9768-B2927F997BB1}'],
         'CMP_balloon_WdfCoInstaller01011_w8_amd64':['{B8755C52-FD83-41F3-8150-1C9B4FAFEDB7}'],
         'CMP_blnsvr_w8_amd64':['{B2A7BDF8-CCF4-4EFD-8B87-D61381D6B9DD}'],
@@ -19,6 +21,8 @@ def get_expected_componentids():
         'CMP_blnsvr_w8.1_amd64':['{23E41A8A-9759-49BF-B459-80B421B29055}'],
         'CMP_Win10x64_balloon':['{75F1C56D-21E9-4A46-AF12-912C9ECD29D2}'],
         'CMP_blnsvr_w10_amd64':['{66B082AC-9CF4-44D1-9CE1-63F7235F6C1C}'],
+        'CMP_Win11x64_balloon':['{7E770B97-A137-4350-837D-A562CEB878AC}'],
+        'CMP_blnsvr_w11_amd64':['{1555D369-5A0F-4ED7-BF58-5B863398A00F}'],
         'CMP_WinServer2012_netkvm':['{45A3A444-B794-4DEF-B733-78C2FDABFA39}'],
         'CMP_netkvm_netkvmco_2k12_amd64':['{18B0E0E7-388F-4D6C-B562-9900FB8F2B38}'],
         'CMP_netkvm_readme_2k12_amd64':['{1D81BACF-85B7-463F-8C4F-3D9E3A541158}'],
@@ -31,6 +35,9 @@ def get_expected_componentids():
         'CMP_WinServer2019_netkvm':['{EDDE3DE9-AEBB-49D5-A232-F2B7310A60A8}'],
         'CMP_netkvm_netkvmco_2k19_amd64':['{27B38D8F-0B8B-4261-8E26-5ACDA7BC5B18}'],
         'CMP_netkvm_readme_2k19_amd64':['{3D8E57A6-4643-4D57-BCC9-658696DB7F56}'],
+        'CMP_WinServer2022_netkvm':['{3FC5E6F9-544A-49A0-963A-8452CB20E949}'],
+        'CMP_netkvm_netkvmco_2k22_amd64':['{F3A70552-1D26-4B75-A5FF-53921B0F0DBC}'],
+        'CMP_netkvm_readme_2k22_amd64':['{3B7BE477-98FC-4E97-80EE-6EC875A49D5E}'],
         'CMP_Win8x64_netkvm':['{161E7681-9AE9-4F31-8D90-02F119DD7555}'],
         'CMP_netkvm_netkvmco_w8_amd64':['{EFC2103D-BED3-4FD6-AC43-93F9B53BFDFE}'],
         'CMP_netkvm_readme_w8_amd64':['{3DAED9C8-8F64-41F2-913D-26D19DD61CBE}'],
@@ -40,9 +47,14 @@ def get_expected_componentids():
         'CMP_Win10x64_netkvm':['{DC8B83A8-6501-4494-81A7-454F43EB07E0}'],
         'CMP_netkvm_netkvmco_w10_amd64':['{2EC241D0-DFB0-4F2D-9E1F-F98475940BA4}'],
         'CMP_netkvm_readme_w10_amd64':['{85EDD336-0051-4F6B-89C3-5AD153E7B554}'],
+        'CMP_Win11x64_netkvm':['{B931E603-768A-4FCE-A505-3E1435EBA378}'],
+        'CMP_netkvm_netkvmco_w11_amd64':['{21928595-F2F6-4669-94C3-2E33BABC247D}'],
+        'CMP_netkvm_readme_w11_amd64':['{20298575-7E69-47A6-82C9-7A9DEB802DB5}'],
         'CMP_WinServer2016_qemufwcfg':['{FD7F28EB-5DD0-4BC8-9C3B-317DB59F6FD5}'],
         'CMP_WinServer2019_qemufwcfg':['{DEEF577E-EA8D-4E8E-9D91-44DA8AB8EA63}'],
+        'CMP_WinServer2022_qemufwcfg':['{AC5A2658-391B-4547-88E5-DA33CCC1F2B5}'],
         'CMP_Win10x64_qemufwcfg':['{863DCB46-9E99-4516-9C8C-FD0613255181}'],
+        'CMP_Win11x64_qemufwcfg':['{43C4B260-4E3B-4AC9-8441-F9A2E693EE1E}'],
         'CMP_WinServer2012_viorng':['{93C2AE75-81D3-437C-A445-9FFF42D1F340}'],
         'CMP_viorng_viorngum_2k12_amd64':['{56C0396B-DDD1-46BB-AEEE-83DD436BE882}'],
         'CMP_viorng_viorngci_2k12_amd64':['{3573D8FB-E339-41A6-A964-D121F5990814}'],
@@ -57,6 +69,9 @@ def get_expected_componentids():
         'CMP_WinServer2019_viorng':['{EB4404C4-34A2-4378-9D66-A4D8841BAE56}'],
         'CMP_viorng_viorngum_2k19_amd64':['{8D85AA97-4238-4A28-9A79-B009FBEA7961}'],
         'CMP_viorng_viorngci_2k19_amd64':['{42CBB3D3-5D05-4491-899A-B75E1436898D}'],
+        'CMP_WinServer2022_viorng':['{8B71783C-4721-4203-BA5B-69664BEECCCD}'],
+        'CMP_viorng_viorngum_2k22_amd64':['{6A477A10-5405-4EDE-B0BB-F5831DE6D644}'],
+        'CMP_viorng_viorngci_2k22_amd64':['{439CF7FD-1B3D-4178-8517-48ADBD64A907}'],
         'CMP_Win8x64_viorng':['{6C430409-AFFA-4239-991F-FE03EA84B11E}'],
         'CMP_viorng_viorngum_w8_amd64':['{A8B4F308-C944-4BC6-898A-0190F041F038}'],
         'CMP_viorng_viorngci_w8_amd64':['{973A1EB2-C4D1-4231-B09B-63864DFD1381}'],
@@ -68,31 +83,40 @@ def get_expected_componentids():
         'CMP_Win10x64_viorng':['{8600A950-7C8B-4EAE-84A4-8FFEA8BE906F}'],
         'CMP_viorng_viorngum_w10_amd64':['{32659F53-B2EB-4D72-A3D9-CBA7C6401D08}'],
         'CMP_viorng_viorngci_w10_amd64':['{4CABF4CC-DDE8-4238-AB70-41693070408B}'],
+        'CMP_Win11x64_viorng':['{09A012A4-0DA0-426E-95B8-5E91CC1AA174}'],
+        'CMP_viorng_viorngum_w11_amd64':['{04DFD7AE-0E1D-4FC5-8F79-EC991DAF03E2}'],
+        'CMP_viorng_viorngci_w11_amd64':['{808F4CD3-85F9-4CBD-BAD2-361DA0D947C6}'],
         'CMP_WinServer2012_vioscsi':['{DF58EBA6-EFA5-4997-AC9E-618EC9093800}'],
         'CMP_WinServer2012R2_vioscsi':['{A7F4C0E2-9BBA-46E9-991C-74AEC0BEE4E6}'],
         'CMP_WinServer2016_vioscsi':['{2581A672-FDCB-45E4-9C3E-2D143FAD9D88}'],
         'CMP_WinServer2019_vioscsi':['{9B505BFA-24F1-4AFA-8F20-1150AD7DC384}'],
+        'CMP_WinServer2022_vioscsi':['{CD88A70E-5F84-4A11-BA3C-AD8D158F8D68}'],
         'CMP_Win8x64_vioscsi':['{59D86BA7-401C-4022-A009-771CEB370A6F}'],
         'CMP_Win81x64_vioscsi':['{212B141F-9939-4945-AACC-EE5D5CDC2717}'],
         'CMP_Win10x64_vioscsi':['{D78BF955-D5B6-4080-A702-E98754D9174A}'],
+        'CMP_Win11x64_vioscsi':['{4F28D54F-7DA0-4027-A61B-50355010345C}'],
         'CMP_WinServer2012_vioser':['{23C405AD-2234-417C-AFA0-33680AA344E5}'],
         'CMP_vioser_WdfCoInstaller01011_2k12_amd64':['{E1897898-22EB-4880-8BDE-192FC8B20CC1}'],
         'CMP_WinServer2012R2_vioser':['{E2EBF6E5-C5B5-41E4-BBDC-B9CCB668D45C}'],
         'CMP_vioser_WdfCoInstaller01011_2k12R2_amd64':['{258E6A77-1A43-4B91-9C57-FA7018A18BF0}'],
         'CMP_WinServer2016_vioser':['{3DCC592D-542C-49E1-90EA-45177C01BC26}'],
         'CMP_WinServer2019_vioser':['{AA85E501-4E99-42A1-A519-9769D8C6ACAC}'],
+        'CMP_WinServer2022_vioser':['{6AEBEAD8-7BE9-4981-A72F-14DC6E076D18}'],
         'CMP_Win8x64_vioser':['{69DC0B9B-F2F8-40C1-9E3D-3CC711696BDF}'],
         'CMP_vioser_WdfCoInstaller01011_w8_amd64':['{178B36BC-BE6B-4853-B586-F6F07853BC3A}'],
         'CMP_Win81x64_vioser':['{73568A72-CFAF-4C60-B915-D45746DC54D9}'],
         'CMP_vioser_WdfCoInstaller01011_w8.1_amd64':['{B183653D-2C4F-4A36-B020-26DE418ADD0D}'],
         'CMP_Win10x64_vioser':['{98A0368C-E2D6-49A8-9B8C-1E3DFBCFFD19}'],
+        'CMP_Win11x64_vioser':['{91CBFAC6-D648-4330-A205-C44B571954CE}'],
         'CMP_WinServer2012_viostor':['{E706318F-9E7A-4421-A951-C2A3562C8EC4}'],
         'CMP_WinServer2012R2_viostor':['{4964D140-95BC-4DF5-B6E6-A9607920C6B6}'],
         'CMP_WinServer2016_viostor':['{6AB4DF0A-AEC8-4F66-B9FE-AB47ADDCB857}'],
         'CMP_WinServer2019_viostor':['{57F26A76-3048-43AD-8852-412BF36D017B}'],
+        'CMP_WinServer2022_viostor':['{83B88AE8-CE82-423F-9ED2-5403381105FE}'],
         'CMP_Win8x64_viostor':['{616B7CA7-4D72-474E-8FA4-CF7DBF76B294}'],
         'CMP_Win81x64_viostor':['{99116486-F088-4E7E-9187-49D5BE1C3B1F}'],
         'CMP_Win10x64_viostor':['{884ADCD2-0334-45AB-9806-F21ED4D16D48}'],
+        'CMP_Win11x64_viostor':['{70FFAB18-7DAA-47D7-86B4-CEA358DEFB0C}'],
         'CMP_WinServer2012_viofs':['{0B1F3B06-EB7C-422E-A347-58BE0D1C5E8B}'],
         'CMP_viofs_WdfCoInstaller01011_2k12_amd64':['{0CED08C2-7C43-40AA-8453-1D72F4455C19}'],
         'CMP_virtiofs_2k12_amd64':['{E27A24F9-EDDA-4F34-ADB6-0E9E8A40AE6A}'],
@@ -103,6 +127,8 @@ def get_expected_componentids():
         'CMP_virtiofs_2k16_amd64':['{7F51A186-28F4-4C7C-986B-279AC73F6C9C}'],
         'CMP_WinServer2019_viofs':['{794FE5BB-E999-4257-A4C1-2E4E9DC4A213}'],
         'CMP_virtiofs_2k19_amd64':['{1D146EAB-CC13-45E8-A0BC-FA70A2F913AF}'],
+        'CMP_WinServer2022_viofs':['{0EE9BBA1-9168-4D30-83BC-9DCD408BEB19}'],
+        'CMP_virtiofs_2k22_amd64':['{E355531E-4609-4CD3-8F9C-361795825A02}'],
         'CMP_Win8x64_viofs':['{5DA3AF56-C49F-47AC-83D7-70AB4AF45292}'],
         'CMP_viofs_WdfCoInstaller01011_w8_amd64':['{1E6ED880-FC13-4912-8F92-B572FF739330}'],
         'CMP_virtiofs_w8_amd64':['{4F231DC2-A646-4463-A55E-F81F19AE2701}'],
@@ -111,13 +137,25 @@ def get_expected_componentids():
         'CMP_virtiofs_w8.1_amd64':['{275DDF53-AE23-40B4-9BA0-850BE7F8C528}'],
         'CMP_Win10x64_viofs':['{E4F42A9F-D576-4606-B2BF-96D24E53E365}'],
         'CMP_virtiofs_w10_amd64':['{3D0B70D1-C98E-4986-A0D1-6CF4B1E06CC9}'],
+        'CMP_Win11x64_viofs':['{78836E98-4BD5-4D03-82CC-3AC21542545D}'],
+        'CMP_virtiofs_w11_amd64':['{643AE04C-905E-478D-A955-387DB8F65425}'],
 #        'CMP_WinServer2012_viogpudo':['{04300AD8-1B36-4BCC-B0B3-B63A2E503F77}'],
 #        'CMP_WinServer2012R2_viogpudo':['{4F2BE310-5CC4-4BB0-B241-870724119DAC}'],
         'CMP_WinServer2016_viogpudo':['{2749BFA1-F330-408C-9FB3-872D173DA3AE}'],
         'CMP_WinServer2019_viogpudo':['{F76D4E1B-9FF2-4B82-A5E3-17F64E6253FC}'],
+        'CMP_WinServer2022_viogpudo':['{B541D990-26F9-4141-AC56-A39A804C3F4D}'],
 #        'CMP_Win8x64_viogpudo':['{72D2DEA4-31C6-4C05-B352-19E103278EC1}'],
 #        'CMP_Win81x64_viogpudo':['{ED43C5C5-C68E-44A5-B798-BFB859933734}'],
         'CMP_Win10x64_viogpudo':['{0FEEC31F-F6E7-4865-AFD3-3E02451C46AD}'],
+        'CMP_Win11x64_viogpudo':['{EAC432D2-C88F-49CA-90E7-7AC72974D325}'],
+        'CMP_WinServer2022_pvpanic':['{6623B93F-8C4A-4FD3-8A02-767B04682A42}'],
+        'CMP_Win11x64_pvpanic':['{B465A5A3-25A9-4924-9F6F-79BFE5066DC3}'],
+        'CMP_WinServer2022_qemupciserial':['{9A944EAD-1E58-4AE0-A2FE-303FE4BCBA69}'],
+        'CMP_Win11x64_qemupciserial':['{8D61E1C4-B9F4-4FDE-A171-5ECFB9AEADBA}'],
+        'CMP_WinServer2022_vioinput':['{753A2041-BE3E-44F9-ABE3-394B7EBD2B46}'],
+        'CMP_vioinput_viohidkmdf_2k22_amd64':['{D80F19F5-B422-4177-A9B9-6233C3A5EEDB}'],
+        'CMP_Win11x64_vioinput':['{FDFC0048-91E6-4179-B235-0941C7EAEAA4}'],
+        'CMP_vioinput_viohidkmdf_w11_amd64':['{283CA7B0-1797-410D-8B42-5255267C5DB0}'],
     }
 
     expected_values_x86 = {
diff --git a/virtio-win-drivers-installer/Drivers/Balloon/balloon.wxi b/virtio-win-drivers-installer/Drivers/Balloon/balloon.wxi
index 46b8b03..c937162 100644
--- a/virtio-win-drivers-installer/Drivers/Balloon/balloon.wxi
+++ b/virtio-win-drivers-installer/Drivers/Balloon/balloon.wxi
@@ -39,6 +39,14 @@
 <?undef balloon_WdfCoInstaller_guid?>
 <?undef balloon_blnsvr_guid?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "824217E9-568A-403A-82E1-408171BDB05B"?>
+<?define balloon_WdfCoInstaller_guid = "0A9AB939-9201-4C18-B16A-AB3724B06D0B"?>
+<?define balloon_blnsvr_guid = "D87C64B1-1769-4D6D-B912-C7389AA5F997"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef balloon_WdfCoInstaller_guid?>
+<?undef balloon_blnsvr_guid?>
+<?undef guid?>
 <!-- w8x64 -->
 <?define guid = "08FCD606-81D7-4AA0-9768-B2927F997BB1"?>
 <?define balloon_WdfCoInstaller_guid = "B8755C52-FD83-41F3-8150-1C9B4FAFEDB7"?>
@@ -63,6 +71,14 @@
 <?undef balloon_WdfCoInstaller_guid?>
 <?undef balloon_blnsvr_guid?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "7E770B97-A137-4350-837D-A562CEB878AC"?>
+<?define balloon_WdfCoInstaller_guid = "663DFEA8-053B-485B-9C0B-8776FE7FC860"?>
+<?define balloon_blnsvr_guid = "1555D369-5A0F-4ED7-BF58-5B863398A00F"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef balloon_WdfCoInstaller_guid?>
+<?undef balloon_blnsvr_guid?>
+<?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "8A0794B3-D4C5-4D2A-A9D2-DD052656839C"?>
diff --git a/virtio-win-drivers-installer/Drivers/Balloon/balloon.wxs b/virtio-win-drivers-installer/Drivers/Balloon/balloon.wxs
index 375c179..4e98128 100644
--- a/virtio-win-drivers-installer/Drivers/Balloon/balloon.wxs
+++ b/virtio-win-drivers-installer/Drivers/Balloon/balloon.wxs
@@ -11,9 +11,11 @@
             <ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' />
diff --git a/virtio-win-drivers-installer/Drivers/GenericWindowsComponets/2k22.wxi b/virtio-win-drivers-installer/Drivers/GenericWindowsComponets/2k22.wxi
new file mode 100755
index 0000000..f381d03
--- /dev/null
+++ b/virtio-win-drivers-installer/Drivers/GenericWindowsComponets/2k22.wxi
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Include xmlns:difx='http://schemas.microsoft.com/wix/DifxAppExtension'>
+<?define WdfCoInstaller01011 = "false" ?>
+<?define osFullName = "WinServer2022" ?>
+<?define osShort = "2k22" ?>
+<?define ISA = "amd64" ?>
+<?define Win64 = "yes" ?>
+<?define condition = "$(var.condition_2k22)" ?>
+<?include ./template.wxi ?>
+<?undef WdfCoInstaller01011?>
+<?undef osFullName?>
+<?undef osShort?>
+<?undef ISA?>
+<?undef Win64?>
+<?undef condition?>
+</Include>
\ No newline at end of file
diff --git a/virtio-win-drivers-installer/Drivers/GenericWindowsComponets/allSupportedWinVersions.wxi b/virtio-win-drivers-installer/Drivers/GenericWindowsComponets/allSupportedWinVersions.wxi
index 6c9e776..54ef106 100644
--- a/virtio-win-drivers-installer/Drivers/GenericWindowsComponets/allSupportedWinVersions.wxi
+++ b/virtio-win-drivers-installer/Drivers/GenericWindowsComponets/allSupportedWinVersions.wxi
@@ -5,7 +5,9 @@
     <?include ./2k12R2.wxi ?>
     <?include ./2k16.wxi ?>
     <?include ./2k19.wxi ?>
+    <?include ./2k22.wxi ?>
     <?include ./w10x64.wxi ?>
+    <?include ./w11x64.wxi ?>
     <?include ./w81x64.wxi?>
     <?include ./w8x64.wxi ?>
     <?else ?>
diff --git a/virtio-win-drivers-installer/Drivers/GenericWindowsComponets/w11x64.wxi b/virtio-win-drivers-installer/Drivers/GenericWindowsComponets/w11x64.wxi
new file mode 100755
index 0000000..7bef0d5
--- /dev/null
+++ b/virtio-win-drivers-installer/Drivers/GenericWindowsComponets/w11x64.wxi
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Include xmlns:difx='http://schemas.microsoft.com/wix/DifxAppExtension'>
+<?define WdfCoInstaller01011 = "false" ?>
+<?define osFullName = "Win11x64" ?>
+<?define osShort = "w11" ?>
+<?define ISA = "amd64" ?>
+<?define Win64 = "yes" ?>
+<?define condition = "$(var.condition_w10x64)" ?>
+<?include ./template.wxi ?>
+<?undef WdfCoInstaller01011?>
+<?undef osFullName?>
+<?undef osShort?>
+<?undef ISA?>
+<?undef Win64?>
+<?undef condition?>
+</Include>
\ No newline at end of file
diff --git a/virtio-win-drivers-installer/Drivers/NetKVM/netkvm.wxi b/virtio-win-drivers-installer/Drivers/NetKVM/netkvm.wxi
index 5fc1649..1d364db 100644
--- a/virtio-win-drivers-installer/Drivers/NetKVM/netkvm.wxi
+++ b/virtio-win-drivers-installer/Drivers/NetKVM/netkvm.wxi
@@ -39,6 +39,14 @@
 <?undef netkvm_netkvmco_guid?>
 <?undef netkvm_readme_guid?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "3FC5E6F9-544A-49A0-963A-8452CB20E949"?>
+<?define netkvm_netkvmco_guid = "F3A70552-1D26-4B75-A5FF-53921B0F0DBC"?>
+<?define netkvm_readme_guid = "3B7BE477-98FC-4E97-80EE-6EC875A49D5E"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef netkvm_netkvmco_guid?>
+<?undef netkvm_readme_guid?>
+<?undef guid?>
 <!-- w8x64 -->
 <?define guid = "161E7681-9AE9-4F31-8D90-02F119DD7555"?>
 <?define netkvm_netkvmco_guid = "EFC2103D-BED3-4FD6-AC43-93F9B53BFDFE"?>
@@ -63,6 +71,14 @@
 <?undef netkvm_netkvmco_guid?>
 <?undef netkvm_readme_guid?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "B931E603-768A-4FCE-A505-3E1435EBA378"?>
+<?define netkvm_netkvmco_guid = "21928595-F2F6-4669-94C3-2E33BABC247D"?>
+<?define netkvm_readme_guid = "20298575-7E69-47A6-82C9-7A9DEB802DB5"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef netkvm_netkvmco_guid?>
+<?undef netkvm_readme_guid?>
+<?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "9370CEF5-6103-4BDB-AD70-C90CCDC036F4"?>
diff --git a/virtio-win-drivers-installer/Drivers/NetKVM/netkvm.wxs b/virtio-win-drivers-installer/Drivers/NetKVM/netkvm.wxs
index cfdf2b7..07492af 100644
--- a/virtio-win-drivers-installer/Drivers/NetKVM/netkvm.wxs
+++ b/virtio-win-drivers-installer/Drivers/NetKVM/netkvm.wxs
@@ -10,10 +10,12 @@
             <ComponentGroupRef Id='CMPG_WinServer2012_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
-			<ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' />
diff --git a/virtio-win-drivers-installer/Drivers/pvpanic/pvpanic.wxi b/virtio-win-drivers-installer/Drivers/pvpanic/pvpanic.wxi
index d5a820b..d6fcb40 100644
--- a/virtio-win-drivers-installer/Drivers/pvpanic/pvpanic.wxi
+++ b/virtio-win-drivers-installer/Drivers/pvpanic/pvpanic.wxi
@@ -31,6 +31,12 @@
 <?include ../GenericWindowsComponets/2k19.wxi ?>
 <?undef pvpanic_WdfCoInstaller_guid?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "6623B93F-8C4A-4FD3-8A02-767B04682A42"?>
+<?define pvpanic_WdfCoInstaller_guid = "D5C5F30B-3A15-4402-9871-8DBA1AE4769A"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef pvpanic_WdfCoInstaller_guid?>
+<?undef guid?>
 <!-- w8x64 -->
 <?define guid = "2D389C8A-E472-4D61-86E7-CF0BBDD56FC5"?>
 <?define pvpanic_WdfCoInstaller_guid = "E0A170EB-F169-4B7B-AD59-E89A8737514A"?>
@@ -49,6 +55,12 @@
 <?include ../GenericWindowsComponets/w10x64.wxi ?>
 <?undef pvpanic_WdfCoInstaller_guid?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "B465A5A3-25A9-4924-9F6F-79BFE5066DC3"?>
+<?define pvpanic_WdfCoInstaller_guid = "85EB5BFC-CE15-46A4-B995-DFC3269C27AE"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef pvpanic_WdfCoInstaller_guid?>
+<?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "6FA93AA4-35E8-4BB5-9AF2-05D92CD17082"?>
diff --git a/virtio-win-drivers-installer/Drivers/pvpanic/pvpanic.wxs b/virtio-win-drivers-installer/Drivers/pvpanic/pvpanic.wxs
index 88b880c..73865dc 100644
--- a/virtio-win-drivers-installer/Drivers/pvpanic/pvpanic.wxs
+++ b/virtio-win-drivers-installer/Drivers/pvpanic/pvpanic.wxs
@@ -11,9 +11,11 @@
             <ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' />
diff --git a/virtio-win-drivers-installer/Drivers/qemufwcfg/qemufwcfg.wxi b/virtio-win-drivers-installer/Drivers/qemufwcfg/qemufwcfg.wxi
index 9107352..0071a4f 100644
--- a/virtio-win-drivers-installer/Drivers/qemufwcfg/qemufwcfg.wxi
+++ b/virtio-win-drivers-installer/Drivers/qemufwcfg/qemufwcfg.wxi
@@ -15,10 +15,18 @@
 <?define guid = "DEEF577E-EA8D-4E8E-9D91-44DA8AB8EA63"?>
 <?include ../GenericWindowsComponets/2k19.wxi ?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "AC5A2658-391B-4547-88E5-DA33CCC1F2B5"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef guid?>
 <!-- w10x64 -->
 <?define guid = "863DCB46-9E99-4516-9C8C-FD0613255181"?>
 <?include ../GenericWindowsComponets/w10x64.wxi ?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "43C4B260-4E3B-4AC9-8441-F9A2E693EE1E"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef guid?>
 <?else ?>
 <!-- w10x86 -->
 <?define guid = "DE108D2F-19E0-4F69-A67A-240D000D7DFC"?>
diff --git a/virtio-win-drivers-installer/Drivers/qemufwcfg/qemufwcfg.wxs b/virtio-win-drivers-installer/Drivers/qemufwcfg/qemufwcfg.wxs
index b1a70f6..fbdaa9d 100644
--- a/virtio-win-drivers-installer/Drivers/qemufwcfg/qemufwcfg.wxs
+++ b/virtio-win-drivers-installer/Drivers/qemufwcfg/qemufwcfg.wxs
@@ -9,7 +9,9 @@
         <?if $(sys.BUILDARCH) = "x64" ?>
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win10x86_$(var.driverName)' />
         <?endif ?>
diff --git a/virtio-win-drivers-installer/Drivers/qemupciserial/qemupciserial.wxi b/virtio-win-drivers-installer/Drivers/qemupciserial/qemupciserial.wxi
index f150e2a..b66a91b 100644
--- a/virtio-win-drivers-installer/Drivers/qemupciserial/qemupciserial.wxi
+++ b/virtio-win-drivers-installer/Drivers/qemupciserial/qemupciserial.wxi
@@ -23,6 +23,10 @@
 <?define guid = "5AC49865-C919-40F7-B254-C19AEB675254"?>
 <?include ../GenericWindowsComponets/2k19.wxi ?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "9A944EAD-1E58-4AE0-A2FE-303FE4BCBA69"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef guid?>
 <!-- w8x64 -->
 <?define guid = "DFA1E88B-8A5F-42A9-ACB7-F045C22E867D"?>
 <?include ../GenericWindowsComponets/w8x64.wxi ?>
@@ -35,6 +39,10 @@
 <?define guid = "9C9D1ED6-9C12-4E1B-8146-AA268BB389B1"?>
 <?include ../GenericWindowsComponets/w10x64.wxi ?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "{8D61E1C4-B9F4-4FDE-A171-5ECFB9AEADBA}"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "473B878E-BC48-48D3-93B8-D00E4C9436AC"?>
diff --git a/virtio-win-drivers-installer/Drivers/qemupciserial/qemupciserial.wxs b/virtio-win-drivers-installer/Drivers/qemupciserial/qemupciserial.wxs
index 5dfafc1..97657eb 100644
--- a/virtio-win-drivers-installer/Drivers/qemupciserial/qemupciserial.wxs
+++ b/virtio-win-drivers-installer/Drivers/qemupciserial/qemupciserial.wxs
@@ -11,9 +11,11 @@
             <ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' />
diff --git a/virtio-win-drivers-installer/Drivers/viofs/viofs.wxi b/virtio-win-drivers-installer/Drivers/viofs/viofs.wxi
index 55f44b2..a093554 100755
--- a/virtio-win-drivers-installer/Drivers/viofs/viofs.wxi
+++ b/virtio-win-drivers-installer/Drivers/viofs/viofs.wxi
@@ -35,6 +35,12 @@
 <?include ../GenericWindowsComponets/2k19.wxi ?>
 <?undef viofs_virtiofs_guid?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "0EE9BBA1-9168-4D30-83BC-9DCD408BEB19"?>
+<?define viofs_virtiofs_guid = "E355531E-4609-4CD3-8F9C-361795825A02"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef viofs_virtiofs_guid?>
+<?undef guid?>
 <!-- w8x64 -->
 <?define guid = "5DA3AF56-C49F-47AC-83D7-70AB4AF45292"?>
 <?define viofs_WdfCoInstaller_guid = "1E6ED880-FC13-4912-8F92-B572FF739330"?>
@@ -57,6 +63,12 @@
 <?include ../GenericWindowsComponets/w10x64.wxi ?>
 <?undef viofs_virtiofs_guid?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "78836E98-4BD5-4D03-82CC-3AC21542545D"?>
+<?define viofs_virtiofs_guid = "643AE04C-905E-478D-A955-387DB8F65425"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef viofs_virtiofs_guid?>
+<?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "968E6D29-2F81-40EB-8318-4C7849228EFD"?>
diff --git a/virtio-win-drivers-installer/Drivers/viofs/viofs.wxs b/virtio-win-drivers-installer/Drivers/viofs/viofs.wxs
index 3193e30..033662e 100755
--- a/virtio-win-drivers-installer/Drivers/viofs/viofs.wxs
+++ b/virtio-win-drivers-installer/Drivers/viofs/viofs.wxs
@@ -11,9 +11,11 @@
             <ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' />
diff --git a/virtio-win-drivers-installer/Drivers/viogpudo/viogpudo.wxi b/virtio-win-drivers-installer/Drivers/viogpudo/viogpudo.wxi
index 8efeeb5..60a2098 100755
--- a/virtio-win-drivers-installer/Drivers/viogpudo/viogpudo.wxi
+++ b/virtio-win-drivers-installer/Drivers/viogpudo/viogpudo.wxi
@@ -23,6 +23,10 @@
 <?define guid = "F76D4E1B-9FF2-4B82-A5E3-17F64E6253FC"?>
 <?include ../GenericWindowsComponets/2k19.wxi ?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "B541D990-26F9-4141-AC56-A39A804C3F4D"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef guid?>
 <!-- w8x64 -->
 <?define guid = "72D2DEA4-31C6-4C05-B352-19E103278EC1"?>
 <?include ../GenericWindowsComponets/w8x64.wxi ?>
@@ -35,6 +39,10 @@
 <?define guid = "0FEEC31F-F6E7-4865-AFD3-3E02451C46AD"?>
 <?include ../GenericWindowsComponets/w10x64.wxi ?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "EAC432D2-C88F-49CA-90E7-7AC72974D325"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "B7583BDC-6079-45F5-8F75-D990547AC7C7"?>
diff --git a/virtio-win-drivers-installer/Drivers/viogpudo/viogpudo.wxs b/virtio-win-drivers-installer/Drivers/viogpudo/viogpudo.wxs
index e9f56f2..7432c8e 100755
--- a/virtio-win-drivers-installer/Drivers/viogpudo/viogpudo.wxs
+++ b/virtio-win-drivers-installer/Drivers/viogpudo/viogpudo.wxs
@@ -11,9 +11,11 @@
             <!-- ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' /-->
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <!-- ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' /-->
             <!-- ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' /-->
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <!-- ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' /-->
             <!-- ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' /-->
diff --git a/virtio-win-drivers-installer/Drivers/vioinput/vioinput.wxi b/virtio-win-drivers-installer/Drivers/vioinput/vioinput.wxi
index 20f87ec..bd3b754 100644
--- a/virtio-win-drivers-installer/Drivers/vioinput/vioinput.wxi
+++ b/virtio-win-drivers-installer/Drivers/vioinput/vioinput.wxi
@@ -9,84 +9,100 @@
 <?if $(sys.BUILDARCH) = "x64" ?>
 <!-- 2k12 -->
 <?define guid = "A6F6D72A-2DE6-4D95-BBE5-67E98999E6DD"?>
-<?define pvpanic_viohidkmdf_guid = "41A2E8DC-D3CA-420D-ACD3-C24033966FA6"?>
+<?define vioinput_viohidkmdf_guid = "41A2E8DC-D3CA-420D-ACD3-C24033966FA6"?>
 <?define vioinput_WdfCoInstaller_guid = "AAE8C79A-7F96-422F-9575-01C43852CF91"?>
 <?include ../GenericWindowsComponets/2k12.wxi ?>
 <?undef vioinput_WdfCoInstaller_guid?>
-<?undef pvpanic_viohidkmdf_guid?>
+<?undef vioinput_viohidkmdf_guid?>
 <?undef guid?>
 <!-- 2k12R2 -->
 <?define guid = "51337132-A046-4519-825F-69A5BC303B4C"?>
-<?define pvpanic_viohidkmdf_guid = "A874B0F1-ED28-4911-8EA4-11185035CA99"?>
+<?define vioinput_viohidkmdf_guid = "A874B0F1-ED28-4911-8EA4-11185035CA99"?>
 <?define vioinput_WdfCoInstaller_guid = "A5329D01-CF24-4E9C-9499-623B27E08480"?>
 <?include ../GenericWindowsComponets/2k12R2.wxi ?>
 <?undef vioinput_WdfCoInstaller_guid?>
-<?undef pvpanic_viohidkmdf_guid?>
+<?undef vioinput_viohidkmdf_guid?>
 <?undef guid?>
 <!-- 2k16 -->
 <?define guid = "9C1C516E-57B9-4B8E-ADAB-84C9EFB86E89"?>
-<?define pvpanic_viohidkmdf_guid = "65F81134-D0CC-4881-87BE-02C7DD0D798E"?>
+<?define vioinput_viohidkmdf_guid = "65F81134-D0CC-4881-87BE-02C7DD0D798E"?>
 <?define vioinput_WdfCoInstaller_guid = "62381D5B-A670-46FE-A299-07520A9645CF"?>
 <?include ../GenericWindowsComponets/2k16.wxi ?>
 <?undef vioinput_WdfCoInstaller_guid?>
-<?undef pvpanic_viohidkmdf_guid?>
+<?undef vioinput_viohidkmdf_guid?>
 <?undef guid?>
 <!-- 2k19 -->
 <?define guid = "C1C61635-5BD8-4318-8F3E-588374DF0FED"?>
-<?define pvpanic_viohidkmdf_guid = "77C8737F-C528-487B-9B31-7A707B375BFE"?>
+<?define vioinput_viohidkmdf_guid = "77C8737F-C528-487B-9B31-7A707B375BFE"?>
 <?define vioinput_WdfCoInstaller_guid = "804FAD41-875D-42AF-8964-24A9A2A6E87D"?>
 <?include ../GenericWindowsComponets/2k19.wxi ?>
 <?undef vioinput_WdfCoInstaller_guid?>
-<?undef pvpanic_viohidkmdf_guid?>
+<?undef vioinput_viohidkmdf_guid?>
+<?undef guid?>
+<!-- 2k22 -->
+<?define guid = "753A2041-BE3E-44F9-ABE3-394B7EBD2B46"?>
+<?define vioinput_viohidkmdf_guid = "D80F19F5-B422-4177-A9B9-6233C3A5EEDB"?>
+<?define vioinput_WdfCoInstaller_guid = "A7A79A94-9117-486F-8C7B-DCBC8ADA293E"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef vioinput_WdfCoInstaller_guid?>
+<?undef vioinput_viohidkmdf_guid?>
 <?undef guid?>
 <!-- w8x64 -->
 <?define guid = "F4B3C864-E684-419D-8494-410F5088DF6F"?>
-<?define pvpanic_viohidkmdf_guid = "EA76EA45-D3DC-4CF6-8DCA-A74132A62DF1"?>
+<?define vioinput_viohidkmdf_guid = "EA76EA45-D3DC-4CF6-8DCA-A74132A62DF1"?>
 <?define vioinput_WdfCoInstaller_guid = "572540EA-7AFE-4E60-842C-2A319DA3EB14"?>
 <?include ../GenericWindowsComponets/w8x64.wxi ?>
 <?undef vioinput_WdfCoInstaller_guid?>
-<?undef pvpanic_viohidkmdf_guid?>
+<?undef vioinput_viohidkmdf_guid?>
 <?undef guid?>
 <!-- w81x64 -->
 <?define guid = "E77162F5-8897-4024-9D4A-DB0183F31030"?>
-<?define pvpanic_viohidkmdf_guid = "F6A57840-27F2-4A26-BFC5-A6CFFFAC5B3F"?>
+<?define vioinput_viohidkmdf_guid = "F6A57840-27F2-4A26-BFC5-A6CFFFAC5B3F"?>
 <?define vioinput_WdfCoInstaller_guid = "DD0A627C-0476-4558-9800-9E839C71C3CF"?>
 <?include ../GenericWindowsComponets/w81x64.wxi ?>
 <?undef vioinput_WdfCoInstaller_guid?>
-<?undef pvpanic_viohidkmdf_guid?>
+<?undef vioinput_viohidkmdf_guid?>
 <?undef guid?>
 <!-- w10x64 -->
 <?define guid = "54B8CF60-EA08-4167-8329-6E3CB02FABEC"?>
-<?define pvpanic_viohidkmdf_guid = "561E44DF-180F-4BBB-9201-2D806AAE12A2"?>
+<?define vioinput_viohidkmdf_guid = "561E44DF-180F-4BBB-9201-2D806AAE12A2"?>
 <?define vioinput_WdfCoInstaller_guid = "39EFC364-E770-4A2F-A0C9-13459A44CF5F"?>
 <?include ../GenericWindowsComponets/w10x64.wxi ?>
 <?undef vioinput_WdfCoInstaller_guid?>
-<?undef pvpanic_viohidkmdf_guid?>
+<?undef vioinput_viohidkmdf_guid?>
+<?undef guid?>
+<!-- w11x64 -->
+<?define guid = "FDFC0048-91E6-4179-B235-0941C7EAEAA4"?>
+<?define vioinput_viohidkmdf_guid = "283CA7B0-1797-410D-8B42-5255267C5DB0"?>
+<?define vioinput_WdfCoInstaller_guid = "98909EC7-C07E-4D60-AD04-582BEAE57C67"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef vioinput_WdfCoInstaller_guid?>
+<?undef vioinput_viohidkmdf_guid?>
 <?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "024EEE9E-EF74-4E9E-BAC5-B284F899C1BD"?>
-<?define pvpanic_viohidkmdf_guid = "52C05E14-55B6-40A7-8CA2-2CDCE2E28CD1"?>
+<?define vioinput_viohidkmdf_guid = "52C05E14-55B6-40A7-8CA2-2CDCE2E28CD1"?>
 <?define vioinput_WdfCoInstaller_guid = "FB99DA3E-AB07-402C-96AE-D2A45FA43A0E"?>
 <?include ../GenericWindowsComponets/w8x86.wxi ?>
 <?undef vioinput_WdfCoInstaller_guid?>
-<?undef pvpanic_viohidkmdf_guid?>
+<?undef vioinput_viohidkmdf_guid?>
 <?undef guid?>
 <!-- w81x86 -->
 <?define guid = "8948023E-E633-4450-B32D-688ACA9C6414"?>
-<?define pvpanic_viohidkmdf_guid = "7683AE29-B308-4FE8-8003-4B3C3F6D08BF"?>
+<?define vioinput_viohidkmdf_guid = "7683AE29-B308-4FE8-8003-4B3C3F6D08BF"?>
 <?define vioinput_WdfCoInstaller_guid = "3709AB73-BCE8-4D5F-82C7-23D5CCBC9CDB"?>
 <?include ../GenericWindowsComponets/w81x86.wxi ?>
 <?undef vioinput_WdfCoInstaller_guid?>
-<?undef pvpanic_viohidkmdf_guid?>
+<?undef vioinput_viohidkmdf_guid?>
 <?undef guid?>
 <!-- w10x86 -->
 <?define guid = "6B54D870-E342-40F9-8CEE-42FA2C2EDEEA"?>
-<?define pvpanic_viohidkmdf_guid = "6EDCAF7A-3996-4A0C-9C44-0CA5DC63A9C2"?>
+<?define vioinput_viohidkmdf_guid = "6EDCAF7A-3996-4A0C-9C44-0CA5DC63A9C2"?>
 <?define vioinput_WdfCoInstaller_guid = "C1BF44A8-0374-491A-B893-FE520EFE4C37"?>
 <?include ../GenericWindowsComponets/w10x86.wxi ?>
 <?undef vioinput_WdfCoInstaller_guid?>
-<?undef pvpanic_viohidkmdf_guid?>
+<?undef vioinput_viohidkmdf_guid?>
 <?undef guid?>
 <?endif ?>
 </Include>
\ No newline at end of file
diff --git a/virtio-win-drivers-installer/Drivers/vioinput/vioinput.wxs b/virtio-win-drivers-installer/Drivers/vioinput/vioinput.wxs
index 12a7d22..ceb4d0a 100644
--- a/virtio-win-drivers-installer/Drivers/vioinput/vioinput.wxs
+++ b/virtio-win-drivers-installer/Drivers/vioinput/vioinput.wxs
@@ -11,9 +11,11 @@
             <ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' />
diff --git a/virtio-win-drivers-installer/Drivers/vioinput/vioinput_extras.wxi b/virtio-win-drivers-installer/Drivers/vioinput/vioinput_extras.wxi
index 4722c0e..039f962 100644
--- a/virtio-win-drivers-installer/Drivers/vioinput/vioinput_extras.wxi
+++ b/virtio-win-drivers-installer/Drivers/vioinput/vioinput_extras.wxi
@@ -2,7 +2,7 @@
 
 <Include xmlns:difx='http://schemas.microsoft.com/wix/DifxAppExtension'>
         <Component Id='CMP_$(var.driverName)_viohidkmdf_$(var.osShort)_$(var.ISA)'
-                Guid='$(var.pvpanic_viohidkmdf_guid)'
+                Guid='$(var.vioinput_viohidkmdf_guid)'
                 Transitive='yes'
                 Win64='$(var.Win64)'>
                 <Condition><![CDATA[$(var.condition)]]></Condition>
diff --git a/virtio-win-drivers-installer/Drivers/viorng/viorng.wxi b/virtio-win-drivers-installer/Drivers/viorng/viorng.wxi
index 8fbc708..1d39071 100644
--- a/virtio-win-drivers-installer/Drivers/viorng/viorng.wxi
+++ b/virtio-win-drivers-installer/Drivers/viorng/viorng.wxi
@@ -47,6 +47,16 @@
 <?undef viorng_viorngum_guid?>
 <?undef viorng_viorngci_guid?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "8B71783C-4721-4203-BA5B-69664BEECCCD"?>
+<?define viorng_viorngum_guid = "6A477A10-5405-4EDE-B0BB-F5831DE6D644"?>
+<?define viorng_viorngci_guid = "439CF7FD-1B3D-4178-8517-48ADBD64A907"?>
+<?define viorng_WdfCoInstaller_guid = "7075E60E-01E9-4553-A4E0-39E5F38527B1"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef viorng_WdfCoInstaller_guid?>
+<?undef viorng_viorngum_guid?>
+<?undef viorng_viorngci_guid?>
+<?undef guid?>
 <!-- w8x64 -->
 <?define guid = "6C430409-AFFA-4239-991F-FE03EA84B11E"?>
 <?define viorng_viorngum_guid = "A8B4F308-C944-4BC6-898A-0190F041F038"?>
@@ -77,6 +87,16 @@
 <?undef viorng_viorngum_guid?>
 <?undef viorng_viorngci_guid?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "09A012A4-0DA0-426E-95B8-5E91CC1AA174"?>
+<?define viorng_viorngum_guid = "04DFD7AE-0E1D-4FC5-8F79-EC991DAF03E2"?>
+<?define viorng_viorngci_guid = "808F4CD3-85F9-4CBD-BAD2-361DA0D947C6"?>
+<?define viorng_WdfCoInstaller_guid = "1B6C1E45-A648-4C72-96AD-0AEB61189CCA"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef viorng_WdfCoInstaller_guid?>
+<?undef viorng_viorngum_guid?>
+<?undef viorng_viorngci_guid?>
+<?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "99B5101C-9EDD-40FF-9528-9B2C630FCECA"?>
diff --git a/virtio-win-drivers-installer/Drivers/viorng/viorng.wxs b/virtio-win-drivers-installer/Drivers/viorng/viorng.wxs
index 5d842b8..a4a15e5 100644
--- a/virtio-win-drivers-installer/Drivers/viorng/viorng.wxs
+++ b/virtio-win-drivers-installer/Drivers/viorng/viorng.wxs
@@ -11,9 +11,11 @@
             <ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' />
diff --git a/virtio-win-drivers-installer/Drivers/vioscsi/vioscsi.wxi b/virtio-win-drivers-installer/Drivers/vioscsi/vioscsi.wxi
index 26df316..9d2f7d4 100644
--- a/virtio-win-drivers-installer/Drivers/vioscsi/vioscsi.wxi
+++ b/virtio-win-drivers-installer/Drivers/vioscsi/vioscsi.wxi
@@ -23,6 +23,10 @@
 <?define guid = "9B505BFA-24F1-4AFA-8F20-1150AD7DC384"?>
 <?include ../GenericWindowsComponets/2k19.wxi ?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "CD88A70E-5F84-4A11-BA3C-AD8D158F8D68"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef guid?>
 <!-- w8x64 -->
 <?define guid = "59D86BA7-401C-4022-A009-771CEB370A6F"?>
 <?include ../GenericWindowsComponets/w8x64.wxi ?>
@@ -35,6 +39,10 @@
 <?define guid = "D78BF955-D5B6-4080-A702-E98754D9174A"?>
 <?include ../GenericWindowsComponets/w10x64.wxi ?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "4F28D54F-7DA0-4027-A61B-50355010345C"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "D4386CD9-8535-4926-90D0-A3E7C54FB0FC"?>
diff --git a/virtio-win-drivers-installer/Drivers/vioscsi/vioscsi.wxs b/virtio-win-drivers-installer/Drivers/vioscsi/vioscsi.wxs
index e24b69b..c708251 100644
--- a/virtio-win-drivers-installer/Drivers/vioscsi/vioscsi.wxs
+++ b/virtio-win-drivers-installer/Drivers/vioscsi/vioscsi.wxs
@@ -11,9 +11,11 @@
             <ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' />
diff --git a/virtio-win-drivers-installer/Drivers/vioserial/vioserial.wxi b/virtio-win-drivers-installer/Drivers/vioserial/vioserial.wxi
index 595e802..b24f0b9 100644
--- a/virtio-win-drivers-installer/Drivers/vioserial/vioserial.wxi
+++ b/virtio-win-drivers-installer/Drivers/vioserial/vioserial.wxi
@@ -31,6 +31,12 @@
 <?include ../GenericWindowsComponets/2k19.wxi ?>
 <?undef vioser_WdfCoInstaller_guid?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "6AEBEAD8-7BE9-4981-A72F-14DC6E076D18"?>
+<?define vioser_WdfCoInstaller_guid = "A6B45CA9-5972-423A-A454-9C78E63CE506"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef vioser_WdfCoInstaller_guid?>
+<?undef guid?>
 <!-- w8x64 -->
 <?define guid = "69DC0B9B-F2F8-40C1-9E3D-3CC711696BDF"?>
 <?define vioser_WdfCoInstaller_guid = "178B36BC-BE6B-4853-B586-F6F07853BC3A"?>
@@ -49,6 +55,12 @@
 <?include ../GenericWindowsComponets/w10x64.wxi ?>
 <?undef vioser_WdfCoInstaller_guid?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "91CBFAC6-D648-4330-A205-C44B571954CE"?>
+<?define vioser_WdfCoInstaller_guid = "E292213D-B93C-4029-87F5-C12CCFF3F1B4"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef vioser_WdfCoInstaller_guid?>
+<?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "349C230C-DF4C-44F5-8F29-5C743772E702"?>
diff --git a/virtio-win-drivers-installer/Drivers/vioserial/vioserial.wxs b/virtio-win-drivers-installer/Drivers/vioserial/vioserial.wxs
index cfae815..d188cc1 100644
--- a/virtio-win-drivers-installer/Drivers/vioserial/vioserial.wxs
+++ b/virtio-win-drivers-installer/Drivers/vioserial/vioserial.wxs
@@ -11,9 +11,11 @@
             <ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' />
diff --git a/virtio-win-drivers-installer/Drivers/viostor/viostor.wxi b/virtio-win-drivers-installer/Drivers/viostor/viostor.wxi
index dbb65ae..2be1af4 100644
--- a/virtio-win-drivers-installer/Drivers/viostor/viostor.wxi
+++ b/virtio-win-drivers-installer/Drivers/viostor/viostor.wxi
@@ -23,6 +23,10 @@
 <?define guid = "57F26A76-3048-43AD-8852-412BF36D017B"?>
 <?include ../GenericWindowsComponets/2k19.wxi ?>
 <?undef guid?>
+<!-- 2k22 -->
+<?define guid = "83B88AE8-CE82-423F-9ED2-5403381105FE"?>
+<?include ../GenericWindowsComponets/2k22.wxi ?>
+<?undef guid?>
 <!-- w8x64 -->
 <?define guid = "616B7CA7-4D72-474E-8FA4-CF7DBF76B294"?>
 <?include ../GenericWindowsComponets/w8x64.wxi ?>
@@ -35,6 +39,10 @@
 <?define guid = "884ADCD2-0334-45AB-9806-F21ED4D16D48"?>
 <?include ../GenericWindowsComponets/w10x64.wxi ?>
 <?undef guid?>
+<!-- w11x64 -->
+<?define guid = "70FFAB18-7DAA-47D7-86B4-CEA358DEFB0C"?>
+<?include ../GenericWindowsComponets/w11x64.wxi ?>
+<?undef guid?>
 <?else ?>
 <!-- w8x86 -->
 <?define guid = "071F14DE-1368-4117-8C82-3A388DF0BE81"?>
diff --git a/virtio-win-drivers-installer/Drivers/viostor/viostor.wxs b/virtio-win-drivers-installer/Drivers/viostor/viostor.wxs
index 37c9f59..14f2c5f 100644
--- a/virtio-win-drivers-installer/Drivers/viostor/viostor.wxs
+++ b/virtio-win-drivers-installer/Drivers/viostor/viostor.wxs
@@ -11,9 +11,11 @@
             <ComponentGroupRef Id='CMPG_WinServer2012R2_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2016_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_WinServer2019_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_WinServer2022_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win8x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x64_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win10x64_$(var.driverName)' />
+            <ComponentGroupRef Id='CMPG_Win11x64_$(var.driverName)' />
         <?else ?>
             <ComponentGroupRef Id='CMPG_Win8x86_$(var.driverName)' />
             <ComponentGroupRef Id='CMPG_Win81x86_$(var.driverName)' />
diff --git a/virtio-win-drivers-installer/constants.wxi.in b/virtio-win-drivers-installer/constants.wxi.in
index a27088b..19757f7 100644
--- a/virtio-win-drivers-installer/constants.wxi.in
+++ b/virtio-win-drivers-installer/constants.wxi.in
@@ -16,10 +16,12 @@
 <?define condition_2k12r2 = '(VersionNT64 = 603 AND REGISTRY_PRODUCT_NAME >< "2012" AND MsiNTProductType > 1)' ?>
 <?define condition_2k16 = '(REGISTRY_PRODUCT_NAME >< "2016" AND MsiNTProductType > 1)' ?>
 <?define condition_2k19 = '(REGISTRY_PRODUCT_NAME >< "2019" AND MsiNTProductType > 1)' ?>
+<?define condition_2k22 = '(REGISTRY_PRODUCT_NAME >< "2022" AND MsiNTProductType > 1)' ?>
 <?define condition_w8x64 = '(VersionNT = 602 AND VersionNT = VersionNT64 AND MsiNTProductType = 1)' ?>
 <?define condition_w8x86 = '(VersionNT = 602 AND VersionNT <> VersionNT64 AND MsiNTProductType = 1)' ?>
 <?define condition_w81x64 = '(REGISTRY_PRODUCT_NAME >< "8.1" AND VersionNT = VersionNT64 AND MsiNTProductType = 1)' ?>
 <?define condition_w81x86 = '(REGISTRY_PRODUCT_NAME >< "8.1" AND VersionNT <> VersionNT64 AND MsiNTProductType = 1)' ?>
 <?define condition_w10x64 = '(REGISTRY_PRODUCT_NAME >< "Windows 10" AND VersionNT = VersionNT64 AND MsiNTProductType = 1)' ?>
 <?define condition_w10x86 = '(REGISTRY_PRODUCT_NAME >< "Windows 10" AND VersionNT <> VersionNT64 AND MsiNTProductType = 1)' ?>
+<?define condition_w11x64 = '(REGISTRY_PRODUCT_NAME >< "Windows 11" AND VersionNT = VersionNT64 AND MsiNTProductType = 1)' ?>
 </Include>
\ No newline at end of file