diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4fdce935..d080f82d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -129,7 +129,7 @@ jobs:
           # TODO: Move different windows platforms into registry dump matrix
           - Windows 2025
           - Windows 2022
-          #- Windows 2019
+          - Windows 2019
           - Linux GCC
           - Linux Clang
           - macOS
@@ -147,9 +147,9 @@ jobs:
           - platform: Windows 2022
             build-platform: Windows
             runner: windows-2022
-          #- platform: Windows 2019
-          #  build-platform: Windows
-          #  runner: windows-2019
+          - platform: Windows 2019
+            build-platform: Windows
+            runner: windows-2019
           - platform: Linux GCC
             build-platform: Linux GCC
             runner: ubuntu-24.04
diff --git a/src/windows-emulator/syscalls.cpp b/src/windows-emulator/syscalls.cpp
index 74e51de7..bf6775b8 100644
--- a/src/windows-emulator/syscalls.cpp
+++ b/src/windows-emulator/syscalls.cpp
@@ -3391,6 +3391,12 @@ namespace
 
         return STATUS_SUCCESS;
     }
+
+    NTSTATUS handle_NtYieldExecution(const syscall_context& c)
+    {
+        c.win_emu.yield_thread();
+        return STATUS_SUCCESS;
+    }
 }
 
 void syscall_dispatcher::add_handlers(std::map<std::string, syscall_handler>& handler_mapping)
@@ -3503,6 +3509,7 @@ void syscall_dispatcher::add_handlers(std::map<std::string, syscall_handler>& ha
     add_handler(NtQueryDirectoryFileEx);
     add_handler(NtUserSystemParametersInfo);
     add_handler(NtGetContextThread);
+    add_handler(NtYieldExecution);
 
 #undef add_handler
 }
diff --git a/src/windows-emulator/windows_emulator.cpp b/src/windows-emulator/windows_emulator.cpp
index 2f0677bd..a111148f 100644
--- a/src/windows-emulator/windows_emulator.cpp
+++ b/src/windows-emulator/windows_emulator.cpp
@@ -265,8 +265,8 @@ namespace
             peb.OSMajorVersion = 0x0000000a;
             peb.OSBuildNumber = 0x00006c51;
 
-            peb.AnsiCodePageData = allocator.reserve<CPTABLEINFO>().value();
-            peb.OemCodePageData = allocator.reserve<CPTABLEINFO>().value();
+            // peb.AnsiCodePageData = allocator.reserve<CPTABLEINFO>().value();
+            // peb.OemCodePageData = allocator.reserve<CPTABLEINFO>().value();
             peb.UnicodeCaseTableData = allocator.reserve<NLSTABLEINFO>().value();
         });
     }