diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index ef8a93ca..cb4d6769 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -217,7 +217,7 @@ jobs:
           mv ./build/PKGBUILD ./artifacts/
 
       - name: Validate package
-        uses: hapakaien/archlinux-package-action@v2.2.0
+        uses: LizardByte/archlinux-package-action@master
         with:
           path: artifacts
           flags: '--syncdeps --noconfirm'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 990cad26..bc88b578 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,9 @@ if(WIN32)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CURL_STATIC_LDFLAGS} ${CURL_STATIC_CFLAGS}")
 
+	# Restrict Boost WinAPI version to work around 1.80 linker errors
+	ADD_DEFINITIONS(-DBOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN7)
+
 	if(NOT DEFINED SUNSHINE_PREPARED_BINARIES)
 		set(SUNSHINE_PREPARED_BINARIES "${CMAKE_CURRENT_BINARY_DIR}/pre-compiled/windows")
 	endif()