diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3169ab9..c8f9a30f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,5 +7,9 @@ on:
 jobs:
  linux:
     uses: minecraft-linux/appimage-builder/.github/workflows/main.yml@main
+    with:
+      mcpelauncher-ref: ${{ github.sha }}
  macOS:
-    uses: minecraft-linux/macos-builder/.github/workflows/main.yml@main
\ No newline at end of file
+    uses: minecraft-linux/macos-builder/.github/workflows/main.yml@main
+    with:
+      mcpelauncher-ref: ${{ github.sha }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2f3d9b8..f953abe9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,7 @@ if (BUILD_CLIENT)
     endif()
 
     include(game-window/BuildSettings.cmake)
+    set(GAMEWINDOW_SYSTEM "SDL3" CACHE STRING "" FORCE)
     if (USE_SDL3_AUDIO OR GAMEWINDOW_SYSTEM STREQUAL "SDL3")
         if(NOT GAMEWINDOW_SYSTEM STREQUAL "SDL3")
             set(SDL_WAYLAND OFF CACHE BOOL "" FORCE)
diff --git a/ext/sdl3.cmake b/ext/sdl3.cmake
index 03d8e7ba..d241ec88 100644
--- a/ext/sdl3.cmake
+++ b/ext/sdl3.cmake
@@ -1,19 +1,19 @@
-# Create an option to switch between a system sdl library and a vendored SDL library
-option(SDL3_VENDORED "Use vendored sdl3 libraries" ON)
-
-if(SDL3_VENDORED)
-    set(SDL3_VENDORED ON CACHE BOOL "" FORCE)
-    set(SDL_SHARED OFF CACHE BOOL "" FORCE)
-    set(SDL_STATIC ON CACHE BOOL "" FORCE)
-    set(SDL_CAMERA OFF CACHE BOOL "" FORCE)
-    set(SDL_RENDER OFF CACHE BOOL "" FORCE)
-    set(SDL_DIALOG OFF CACHE BOOL "" FORCE)
-    set(SDL_SENSOR OFF CACHE BOOL "" FORCE)
-    set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 CACHE STRING "" FORCE)
-    add_subdirectory(sdl3 EXCLUDE_FROM_ALL)
-else()
-    # 1. Look for a SDL3 package,
-    # 2. look for the SDL3-shared component, and
-    # 3. fail if the shared component cannot be found.
-    find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3-shared)
+# Create an option to switch between a system sdl library and a vendored SDL library
+option(SDL3_VENDORED "Use vendored sdl3 libraries" ON)
+
+if(SDL3_VENDORED)
+    set(SDL3_VENDORED ON CACHE BOOL "" FORCE)
+    set(SDL_SHARED OFF CACHE BOOL "" FORCE)
+    set(SDL_STATIC ON CACHE BOOL "" FORCE)
+    set(SDL_CAMERA OFF CACHE BOOL "" FORCE)
+    set(SDL_RENDER OFF CACHE BOOL "" FORCE)
+    set(SDL_DIALOG OFF CACHE BOOL "" FORCE)
+    set(SDL_SENSOR OFF CACHE BOOL "" FORCE)
+    set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 CACHE STRING "" FORCE)
+    add_subdirectory(sdl3 EXCLUDE_FROM_ALL)
+else()
+    # 1. Look for a SDL3 package,
+    # 2. look for the SDL3-shared component, and
+    # 3. fail if the shared component cannot be found.
+    find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3-shared)
 endif()
\ No newline at end of file