diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f63ab83ee..a46420ef2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -116,8 +116,6 @@ jobs:
           ccache --zero-stats
           cmake -S . \
                 -B build \
-                -DWANT_VST_32=OFF \
-                -DWANT_VST_64=OFF \
                 $CMAKE_OPTS
       - name: Build
         run: cmake --build build
diff --git a/cmake/modules/CheckWineGcc.cmake b/cmake/modules/CheckWineGcc.cmake
index 2956198d8..d1694924b 100644
--- a/cmake/modules/CheckWineGcc.cmake
+++ b/cmake/modules/CheckWineGcc.cmake
@@ -9,7 +9,19 @@ FUNCTION(CheckWineGcc BITNESS WINEGCC_EXECUTABLE RESULT)
 		return 0;
 	}
 	")
-	EXECUTE_PROCESS(COMMAND ${WINEGCC_EXECUTABLE} "-m${BITNESS}"
+
+	# Handle non-Intel platforms
+	IF(LMMS_HOST_X86_64 OR LMMS_HOST_X86)
+		SET(MPLATFORM "-m${BITNESS}")
+	ELSEIF(BITNESS EQUAL 64)
+		SET(MPLATFORM "")
+	ELSE()
+		# Skip 32-bit for non-Intel
+		SET(${RESULT} False PARENT_SCOPE)
+		RETURN()
+	ENDIF()
+
+	EXECUTE_PROCESS(COMMAND ${WINEGCC_EXECUTABLE} "${MPLATFORM}"
 		"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test.cxx"
 		"-o" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/winegcc_test"
 		OUTPUT_QUIET ERROR_QUIET
diff --git a/cmake/modules/FindWine.cmake b/cmake/modules/FindWine.cmake
index eeef8d9c2..ea8d90cd2 100644
--- a/cmake/modules/FindWine.cmake
+++ b/cmake/modules/FindWine.cmake
@@ -73,8 +73,13 @@ FIND_PROGRAM(WINE_BUILD NAMES winebuild PATHS ${WINE_CXX_LOCATIONS} NO_DEFAULT_P
 # Detect wine paths and handle linking problems
 IF(WINE_CXX)
 	# call wineg++ to obtain implied includes and libs
-	execute_process(COMMAND ${WINE_CXX} -m32 -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_32 ERROR_QUIET)
-	execute_process(COMMAND ${WINE_CXX} -m64 -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_64 ERROR_QUIET)
+	if(LMMS_HOST_X86_64 OR LMMS_HOST_X86)
+		execute_process(COMMAND ${WINE_CXX} -m32 -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_32 ERROR_QUIET)
+		execute_process(COMMAND ${WINE_CXX} -m64 -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_64 ERROR_QUIET)
+	else()
+		execute_process(COMMAND ${WINE_CXX} -v /dev/zero OUTPUT_VARIABLE WINEBUILD_OUTPUT_64 ERROR_QUIET)
+	endif()
+
 	_findwine_find_flags("${WINEBUILD_OUTPUT_32}" "^-isystem/usr/include$" BUGGED_WINEGCC)
 	_findwine_find_flags("${WINEBUILD_OUTPUT_32}" "^-isystem" WINEGCC_INCLUDE_DIR)
 	_findwine_find_flags("${WINEBUILD_OUTPUT_32}" "libwinecrt0\\.a.*" WINECRT_32)
diff --git a/plugins/VstBase/RemoteVstPlugin64.cmake b/plugins/VstBase/RemoteVstPlugin64.cmake
index 2f4a745ac..a36d1777f 100644
--- a/plugins/VstBase/RemoteVstPlugin64.cmake
+++ b/plugins/VstBase/RemoteVstPlugin64.cmake
@@ -1,12 +1,15 @@
 IF(LMMS_BUILD_WIN64)
 	ADD_SUBDIRECTORY(RemoteVstPlugin)
 ELSEIF(LMMS_BUILD_LINUX)
+	if(LMMS_HOST_X86_64)
+		set(CXX_FLAGS -m64)
+	endif()
 	ExternalProject_Add(RemoteVstPlugin64
 		"${EXTERNALPROJECT_ARGS}"
 		CMAKE_ARGS
 			"${EXTERNALPROJECT_CMAKE_ARGS}"
 			"-DCMAKE_CXX_COMPILER=${WINEGCC}"
-			"-DCMAKE_CXX_FLAGS=-m64"
+			"-DCMAKE_CXX_FLAGS=${CXX_FLAGS}"
 	)
 	INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin64" "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin64.exe.so" DESTINATION "${PLUGIN_DIR}")
 ENDIF()